PPC/s390: fix compilation error on -Wextra-semi

Bug: chromium:926235
Change-Id: I7af37f574c03439da34afc86cc8e6f49c3781579
Reviewed-on: https://chromium-review.googlesource.com/c/1470810
Commit-Queue: Junliang Yan <jyan@ca.ibm.com>
Reviewed-by: Milad Farazmand <miladfar@ca.ibm.com>
Cr-Commit-Position: refs/heads/master@{#59574}

src/compiler/backend/s390/instruction-selector-s390.cc

@@ -37,7 +37,7 @@ enum class OperandMode : uint32_t {
 };
 
 typedef base::Flags<OperandMode, uint32_t> OperandModes;
-DEFINE_OPERATORS_FOR_FLAGS(OperandModes);
+DEFINE_OPERATORS_FOR_FLAGS(OperandModes)
 OperandModes immediateModeMask =
     OperandMode::kShift32Imm | OperandMode::kShift64Imm |
     OperandMode::kInt32Imm | OperandMode::kInt32Imm_Negate |
@@ -562,7 +562,7 @@ void VisitBinOp(InstructionSelector* selector, Node* node,
     FlagsContinuation cont;                                               \
     Visit##type1##type2##Op(selector, node, opcode, operand_mode, &cont); \
   }
-VISIT_OP_LIST(DECLARE_VISIT_HELPER_FUNCTIONS);
+VISIT_OP_LIST(DECLARE_VISIT_HELPER_FUNCTIONS)
 #undef DECLARE_VISIT_HELPER_FUNCTIONS
 #undef VISIT_OP_LIST_32
 #undef VISIT_OP_LIST
@@ -1544,10 +1544,10 @@ static inline bool TryMatchDoubleConstructFromInsert(
     Visit##type##BinOp(this, node, op, mode);           \
   }
 
-WORD32_BIN_OP_LIST(DECLARE_BIN_OP);
-WORD32_UNARY_OP_LIST(DECLARE_UNARY_OP);
-FLOAT_UNARY_OP_LIST(DECLARE_UNARY_OP);
-FLOAT_BIN_OP_LIST(DECLARE_BIN_OP);
+WORD32_BIN_OP_LIST(DECLARE_BIN_OP)
+WORD32_UNARY_OP_LIST(DECLARE_UNARY_OP)
+FLOAT_UNARY_OP_LIST(DECLARE_UNARY_OP)
+FLOAT_BIN_OP_LIST(DECLARE_BIN_OP)
 
 #if V8_TARGET_ARCH_S390X
 WORD64_UNARY_OP_LIST(DECLARE_UNARY_OP)

src/ppc/simulator-ppc.cc

@@ -883,7 +883,7 @@ void Simulator::TrashCallerSaveRegisters() {
     return WriteEx(addr, value);                                 \
   }
 
-RW_VAR_LIST(GENERATE_RW_FUNC);
+RW_VAR_LIST(GENERATE_RW_FUNC)
 #undef GENERATE_RW_FUNC
 
 // Returns the limit of the stack area to enable checking for stack overflows.

src/ppc/simulator-ppc.h

@@ -295,7 +295,7 @@ class Simulator : public SimulatorBase {
   inline void Write##size(uintptr_t addr, type value); \
   inline int32_t WriteEx##size(uintptr_t addr, type value);
 
-  RW_VAR_LIST(GENERATE_RW_FUNC);
+  RW_VAR_LIST(GENERATE_RW_FUNC)
 #undef GENERATE_RW_FUNC
 
   void Trace(Instruction* instr);

src/s390/assembler-s390.h

@@ -505,7 +505,7 @@ inline void rsy_format(Opcode op, int f1, int f2, int f3, int f4) {
   void name(Register r1, Register r3, const MemOperand& opnd) {            \
     name(r1, r3, opnd.getBaseRegister(), Operand(opnd.getDisplacement())); \
   }
-  S390_RSY_A_OPCODE_LIST(DECLARE_S390_RSY_A_INSTRUCTIONS);
+  S390_RSY_A_OPCODE_LIST(DECLARE_S390_RSY_A_INSTRUCTIONS)
 #undef DECLARE_S390_RSY_A_INSTRUCTIONS
 
 #define DECLARE_S390_RSY_B_INSTRUCTIONS(name, op_name, op_value)            \
@@ -515,7 +515,7 @@ inline void rsy_format(Opcode op, int f1, int f2, int f3, int f4) {
   void name(Register r1, Condition m3, const MemOperand& opnd) {            \
     name(r1, m3, opnd.getBaseRegister(), Operand(opnd.getDisplacement()));  \
   }
-  S390_RSY_B_OPCODE_LIST(DECLARE_S390_RSY_B_INSTRUCTIONS);
+  S390_RSY_B_OPCODE_LIST(DECLARE_S390_RSY_B_INSTRUCTIONS)
 #undef DECLARE_S390_RSY_B_INSTRUCTIONS
 
 
@@ -535,7 +535,7 @@ inline void rs_format(Opcode op, int f1, int f2, int f3, const int f4) {
   void name(Register r1, Register r3, const MemOperand& opnd) {             \
     name(r1, r3, opnd.getBaseRegister(), Operand(opnd.getDisplacement()));  \
   }
-  S390_RS_A_OPCODE_LIST(DECLARE_S390_RS_A_INSTRUCTIONS);
+  S390_RS_A_OPCODE_LIST(DECLARE_S390_RS_A_INSTRUCTIONS)
 #undef DECLARE_S390_RS_A_INSTRUCTIONS
 
 #define DECLARE_S390_RS_B_INSTRUCTIONS(name, op_name, op_value)             \
@@ -545,7 +545,7 @@ inline void rs_format(Opcode op, int f1, int f2, int f3, const int f4) {
   void name(Register r1, Condition m3, const MemOperand& opnd) {            \
     name(r1, m3, opnd.getBaseRegister(), Operand(opnd.getDisplacement()));  \
   }
-  S390_RS_B_OPCODE_LIST(DECLARE_S390_RS_B_INSTRUCTIONS);
+  S390_RS_B_OPCODE_LIST(DECLARE_S390_RS_B_INSTRUCTIONS)
 #undef DECLARE_S390_RS_B_INSTRUCTIONS
 
 #define DECLARE_S390_RS_SHIFT_FORMAT(name, opcode)                          \
@@ -591,7 +591,7 @@ inline void rxe_format(Opcode op, int f1, int f2, int f3, int f4, int f5 = 0) {
     name(Register::from_code(r1.code()), opnd.rx(), opnd.rb(),             \
          Operand(opnd.offset()));                                          \
   }
-  S390_RXE_OPCODE_LIST(DECLARE_S390_RXE_INSTRUCTIONS);
+  S390_RXE_OPCODE_LIST(DECLARE_S390_RXE_INSTRUCTIONS)
 #undef DECLARE_S390_RXE_INSTRUCTIONS
 
 
@@ -610,7 +610,7 @@ inline void ri_format(Opcode opcode, int f1, int f2) {
     DCHECK(is_uint16(i2.immediate()) || is_int16(i2.immediate()));         \
     ri_format(op_name, r.code(), i2.immediate());                          \
   }
-  S390_RI_A_OPCODE_LIST(DECLARE_S390_RI_A_INSTRUCTIONS);
+  S390_RI_A_OPCODE_LIST(DECLARE_S390_RI_A_INSTRUCTIONS)
 #undef DECLARE_S390_RI_A_INSTRUCTIONS
 
 #define DECLARE_S390_RI_B_INSTRUCTIONS(name, op_name, op_value)            \
@@ -621,7 +621,7 @@ inline void ri_format(Opcode opcode, int f1, int f2) {
     halfwordOp.setBits(16);                                                \
     ri_format(op_name, r1.code(), halfwordOp.immediate());                 \
   }
-  S390_RI_B_OPCODE_LIST(DECLARE_S390_RI_B_INSTRUCTIONS);
+  S390_RI_B_OPCODE_LIST(DECLARE_S390_RI_B_INSTRUCTIONS)
 #undef DECLARE_S390_RI_B_INSTRUCTIONS
 
 #define DECLARE_S390_RI_C_INSTRUCTIONS(name, op_name, op_value)            \
@@ -632,7 +632,7 @@ inline void ri_format(Opcode opcode, int f1, int f2) {
            is_int16(i2.immediate()) : is_uint16(i2.immediate()));          \
     ri_format(op_name, m, i2.immediate());                                 \
   }
-  S390_RI_C_OPCODE_LIST(DECLARE_S390_RI_C_INSTRUCTIONS);
+  S390_RI_C_OPCODE_LIST(DECLARE_S390_RI_C_INSTRUCTIONS)
 #undef DECLARE_S390_RI_C_INSTRUCTIONS
 
 
@@ -652,7 +652,7 @@ inline void rrf_format(Opcode op, int f1, int f2, int f3, int f4) {
   void name(Register r1, Register r2, Register r3) {                       \
     name(r1, Condition(0), r2, r3);                                        \
   }
-  S390_RRF_A_OPCODE_LIST(DECLARE_S390_RRF_A_INSTRUCTIONS);
+  S390_RRF_A_OPCODE_LIST(DECLARE_S390_RRF_A_INSTRUCTIONS)
 #undef DECLARE_S390_RRF_A_INSTRUCTIONS
 
 
@@ -663,7 +663,7 @@ inline void rrf_format(Opcode op, int f1, int f2, int f3, int f4) {
   void name(Register r1, Register r2, Register r3) {                       \
     name(r1, Condition(0), r2, r3);                                        \
   }
-  S390_RRF_B_OPCODE_LIST(DECLARE_S390_RRF_B_INSTRUCTIONS);
+  S390_RRF_B_OPCODE_LIST(DECLARE_S390_RRF_B_INSTRUCTIONS)
 #undef DECLARE_S390_RRF_B_INSTRUCTIONS
 
 
@@ -676,7 +676,7 @@ inline void rrf_format(Opcode op, int f1, int f2, int f3, int f4) {
   void name(Condition m3, R1 r1, R2 r2) {                                  \
     name(m3, Condition(0), r1, r2);                                        \
   }
-  S390_RRF_C_OPCODE_LIST(DECLARE_S390_RRF_C_INSTRUCTIONS);
+  S390_RRF_C_OPCODE_LIST(DECLARE_S390_RRF_C_INSTRUCTIONS)
 #undef DECLARE_S390_RRF_C_INSTRUCTIONS
 
 
@@ -689,7 +689,7 @@ inline void rrf_format(Opcode op, int f1, int f2, int f3, int f4) {
   void name(Condition m3, R1 r1, R2 r2) {                                  \
     name(m3, Condition(0), r1, r2);                                        \
   }
-  S390_RRF_D_OPCODE_LIST(DECLARE_S390_RRF_D_INSTRUCTIONS);
+  S390_RRF_D_OPCODE_LIST(DECLARE_S390_RRF_D_INSTRUCTIONS)
 #undef DECLARE_S390_RRF_D_INSTRUCTIONS
 
 
@@ -702,7 +702,7 @@ inline void rrf_format(Opcode op, int f1, int f2, int f3, int f4) {
   void name(M3 m3, R1 r1, R2 r2) {                                         \
     name(m3, Condition(0), r1, r2);                                        \
   }
-  S390_RRF_E_OPCODE_LIST(DECLARE_S390_RRF_E_INSTRUCTIONS);
+  S390_RRF_E_OPCODE_LIST(DECLARE_S390_RRF_E_INSTRUCTIONS)
 #undef DECLARE_S390_RRF_E_INSTRUCTIONS
 
 enum FIDBRA_FLAGS {
@@ -729,7 +729,7 @@ inline void rsi_format(Opcode op, int f1, int f2, int f3) {
   void name(Register r1, Register r3, const Operand& i2) {               \
     rsi_format(op_name, r1.code(), r3.code(), i2.immediate());           \
   }
-  S390_RSI_OPCODE_LIST(DECLARE_S390_RSI_INSTRUCTIONS);
+  S390_RSI_OPCODE_LIST(DECLARE_S390_RSI_INSTRUCTIONS)
 #undef DECLARE_S390_RSI_INSTRUCTIONS
 
 
@@ -751,7 +751,7 @@ inline void rsl_format(Opcode op, uint16_t f1, int f2, int f3, int f4,
     uint16_t L = static_cast<uint16_t>(l1.immediate() << 8);             \
     rsl_format(op_name, L, b1.code(), d1.immediate(), 0, 0);             \
   }
-  S390_RSL_A_OPCODE_LIST(DECLARE_S390_RSL_A_INSTRUCTIONS);
+  S390_RSL_A_OPCODE_LIST(DECLARE_S390_RSL_A_INSTRUCTIONS)
 #undef DECLARE_S390_RSL_A_INSTRUCTIONS
 
 #define DECLARE_S390_RSL_B_INSTRUCTIONS(name, op_name, op_value)         \
@@ -760,7 +760,7 @@ inline void rsl_format(Opcode op, uint16_t f1, int f2, int f3, int f4,
     uint16_t L = static_cast<uint16_t>(l2.immediate());                  \
     rsl_format(op_name, L, b2.code(), d2.immediate(), r1.code(), m3);    \
   }
-  S390_RSL_B_OPCODE_LIST(DECLARE_S390_RSL_B_INSTRUCTIONS);
+  S390_RSL_B_OPCODE_LIST(DECLARE_S390_RSL_B_INSTRUCTIONS)
 #undef DECLARE_S390_RSL_B_INSTRUCTIONS
 
 
@@ -785,7 +785,7 @@ inline void s_format(Opcode op, int f1, int f2) {
     Operand d2 = Operand(opnd.getDisplacement());                        \
     name(opnd.getBaseRegister(), d2);                                    \
   }
-  S390_S_OPCODE_LIST(DECLARE_S390_S_INSTRUCTIONS);
+  S390_S_OPCODE_LIST(DECLARE_S390_S_INSTRUCTIONS)
 #undef DECLARE_S390_S_INSTRUCTIONS
 
 
@@ -804,7 +804,7 @@ inline void si_format(Opcode op, int f1, int f2, int f3) {
   void name(const MemOperand& opnd, const Operand& i2) {                 \
     name(i2, opnd.getBaseRegister(), Operand(opnd.getDisplacement()));   \
   }
-  S390_SI_OPCODE_LIST(DECLARE_S390_SI_INSTRUCTIONS);
+  S390_SI_OPCODE_LIST(DECLARE_S390_SI_INSTRUCTIONS)
 #undef DECLARE_S390_SI_INSTRUCTIONS
 
 
@@ -828,7 +828,7 @@ inline void siy_format(Opcode op, int f1, int f2, int f3) {
   void name(const MemOperand& opnd, const Operand& i2) {                 \
     name(i2, opnd.getBaseRegister(), Operand(opnd.getDisplacement()));   \
   }
-  S390_SIY_OPCODE_LIST(DECLARE_S390_SIY_INSTRUCTIONS);
+  S390_SIY_OPCODE_LIST(DECLARE_S390_SIY_INSTRUCTIONS)
 #undef DECLARE_S390_SIY_INSTRUCTIONS
 
 
@@ -856,7 +856,7 @@ inline void rrs_format(Opcode op, int f1, int f2, int f3, int f4, int f5) {
     name(r1, r2, opnd.getBaseRegister(),                                 \
          Operand(opnd.getDisplacement()), m3);                           \
   }
-  S390_RRS_OPCODE_LIST(DECLARE_S390_RRS_INSTRUCTIONS);
+  S390_RRS_OPCODE_LIST(DECLARE_S390_RRS_INSTRUCTIONS)
 #undef DECLARE_S390_RRS_INSTRUCTIONS
 
 
@@ -885,7 +885,7 @@ inline void ris_format(Opcode op, int f1, int f2, int f3, int f4, int f5) {
     name(r1, m3, opnd.getBaseRegister(),                                 \
          Operand(opnd.getDisplacement()), i2);                           \
   }
-  S390_RIS_OPCODE_LIST(DECLARE_S390_RIS_INSTRUCTIONS);
+  S390_RIS_OPCODE_LIST(DECLARE_S390_RIS_INSTRUCTIONS)
 #undef DECLARE_S390_RIS_INSTRUCTIONS
 
 
@@ -907,7 +907,7 @@ inline void sil_format(Opcode op, int f1, int f2, int f3) {
   void name(const MemOperand& opnd, const Operand& i2) {                 \
     name(opnd.getBaseRegister(), Operand(opnd.getDisplacement()), i2);   \
   }
-  S390_SIL_OPCODE_LIST(DECLARE_S390_SIL_INSTRUCTIONS);
+  S390_SIL_OPCODE_LIST(DECLARE_S390_SIL_INSTRUCTIONS)
 #undef DECLARE_S390_SIL_INSTRUCTIONS
 
 

src/s390/constants-s390.h

@@ -2067,7 +2067,7 @@ class SixByteInstruction : public Instruction {
 // I Instruction
 class IInstruction : public TwoByteInstruction {
  public:
-  DECLARE_FIELD_FOR_TWO_BYTE_INSTR(IValue, int, 8, 16);
+  DECLARE_FIELD_FOR_TWO_BYTE_INSTR(IValue, int, 8, 16)
 };
 
 // E Instruction
@@ -2076,25 +2076,25 @@ class EInstruction : public TwoByteInstruction {};
 // IE Instruction
 class IEInstruction : public FourByteInstruction {
  public:
-  DECLARE_FIELD_FOR_FOUR_BYTE_INSTR(I1Value, int, 24, 28);
-  DECLARE_FIELD_FOR_FOUR_BYTE_INSTR(I2Value, int, 28, 32);
+  DECLARE_FIELD_FOR_FOUR_BYTE_INSTR(I1Value, int, 24, 28)
+  DECLARE_FIELD_FOR_FOUR_BYTE_INSTR(I2Value, int, 28, 32)
 };
 
 // MII Instruction
 class MIIInstruction : public SixByteInstruction {
  public:
-  DECLARE_FIELD_FOR_SIX_BYTE_INSTR(M1Value, uint32_t, 8, 12);
-  DECLARE_FIELD_FOR_SIX_BYTE_INSTR(RI2Value, int, 12, 24);
-  DECLARE_FIELD_FOR_SIX_BYTE_INSTR(RI3Value, int, 24, 47);
+  DECLARE_FIELD_FOR_SIX_BYTE_INSTR(M1Value, uint32_t, 8, 12)
+  DECLARE_FIELD_FOR_SIX_BYTE_INSTR(RI2Value, int, 12, 24)
+  DECLARE_FIELD_FOR_SIX_BYTE_INSTR(RI3Value, int, 24, 47)
 };
 
 // RI Instruction
 class RIInstruction : public FourByteInstruction {
  public:
-  DECLARE_FIELD_FOR_FOUR_BYTE_INSTR(R1Value, int, 8, 12);
-  DECLARE_FIELD_FOR_FOUR_BYTE_INSTR(I2Value, int, 16, 32);
-  DECLARE_FIELD_FOR_FOUR_BYTE_INSTR(I2UnsignedValue, uint32_t, 16, 32);
-  DECLARE_FIELD_FOR_FOUR_BYTE_INSTR(M1Value, uint32_t, 8, 12);
+  DECLARE_FIELD_FOR_FOUR_BYTE_INSTR(R1Value, int, 8, 12)
+  DECLARE_FIELD_FOR_FOUR_BYTE_INSTR(I2Value, int, 16, 32)
+  DECLARE_FIELD_FOR_FOUR_BYTE_INSTR(I2UnsignedValue, uint32_t, 16, 32)
+  DECLARE_FIELD_FOR_FOUR_BYTE_INSTR(M1Value, uint32_t, 8, 12)
 };
 
 // RR Instruction
@@ -2290,12 +2290,12 @@ class RIEInstruction : Instruction {
 // VRR Instruction
 class VRR_C_Instruction : SixByteInstruction {
  public:
-  DECLARE_FIELD_FOR_SIX_BYTE_INSTR(R1Value, int, 8, 12);
-  DECLARE_FIELD_FOR_SIX_BYTE_INSTR(R2Value, int, 12, 16);
-  DECLARE_FIELD_FOR_SIX_BYTE_INSTR(R3Value, int, 16, 20);
-  DECLARE_FIELD_FOR_SIX_BYTE_INSTR(M6Value, uint32_t, 24, 28);
-  DECLARE_FIELD_FOR_SIX_BYTE_INSTR(M5Value, uint32_t, 28, 32);
-  DECLARE_FIELD_FOR_SIX_BYTE_INSTR(M4Value, uint32_t, 32, 36);
+  DECLARE_FIELD_FOR_SIX_BYTE_INSTR(R1Value, int, 8, 12)
+  DECLARE_FIELD_FOR_SIX_BYTE_INSTR(R2Value, int, 12, 16)
+  DECLARE_FIELD_FOR_SIX_BYTE_INSTR(R3Value, int, 16, 20)
+  DECLARE_FIELD_FOR_SIX_BYTE_INSTR(M6Value, uint32_t, 24, 28)
+  DECLARE_FIELD_FOR_SIX_BYTE_INSTR(M5Value, uint32_t, 28, 32)
+  DECLARE_FIELD_FOR_SIX_BYTE_INSTR(M4Value, uint32_t, 32, 36)
 };
 
 // Helper functions for converting between register numbers and names.