s390: cleanup s390 opcode table

src/s390/assembler-s390.h

 // Copyright (c) 1994-2006 Sun Microsystems Inc.
 // All Rights Reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions
 // are met:
 //
 // - Redistributions of source code must retain the above copyright notice,
 // this list of conditions and the following disclaimer.
 //
@@ skipping 752 matching lines @@
             Condition m3) {                                                   \
     uint64_t code = (static_cast<uint64_t>(opcode_value & 0xFF00)) * B32 |    \
                     (static_cast<uint64_t>(v1.code())) * B36 |                \
                     (static_cast<uint64_t>(v2.code())) * B32 |                \
                     (static_cast<uint64_t>(m5 & 0xF)) * B20 |                 \
                     (static_cast<uint64_t>(m4 & 0xF)) * B16 |                 \
                     (static_cast<uint64_t>(m3 & 0xF)) * B12 |                 \
                     (static_cast<uint64_t>(opcode_value & 0x00FF));           \
     emit6bytes(code);                                                         \
   }
-  VRR_A_OPCODE_LIST(DECLARE_VRR_A_INSTRUCTIONS)
+  S390_VRR_A_OPCODE_LIST(DECLARE_VRR_A_INSTRUCTIONS)
 #undef DECLARE_VRR_A_INSTRUCTIONS
 
 #define DECLARE_VRR_C_INSTRUCTIONS(name, opcode_name, opcode_value)        \
   void name(DoubleRegister v1, DoubleRegister v2, DoubleRegister v3,       \
             Condition m6, Condition m5, Condition m4) {                    \
     uint64_t code = (static_cast<uint64_t>(opcode_value & 0xFF00)) * B32 | \
                     (static_cast<uint64_t>(v1.code())) * B36 |             \
                     (static_cast<uint64_t>(v2.code())) * B32 |             \
                     (static_cast<uint64_t>(v3.code())) * B28 |             \
                     (static_cast<uint64_t>(m6 & 0xF)) * B20 |              \
                     (static_cast<uint64_t>(m5 & 0xF)) * B16 |              \
                     (static_cast<uint64_t>(m4 & 0xF)) * B12 |              \
                     (static_cast<uint64_t>(opcode_value & 0x00FF));        \
     emit6bytes(code);                                                      \
   }
-  VRR_C_OPCODE_LIST(DECLARE_VRR_C_INSTRUCTIONS)
+  S390_VRR_C_OPCODE_LIST(DECLARE_VRR_C_INSTRUCTIONS)
 #undef DECLARE_VRR_C_INSTRUCTIONS
 
   // Single Element format
   void vfa(DoubleRegister v1, DoubleRegister v2, DoubleRegister v3) {
     vfa(v1, v2, v3, static_cast<Condition>(0), static_cast<Condition>(8),
         static_cast<Condition>(3));
   }
   void vfs(DoubleRegister v1, DoubleRegister v2, DoubleRegister v3) {
     vfs(v1, v2, v3, static_cast<Condition>(0), static_cast<Condition>(8),
         static_cast<Condition>(3));
@@ skipping 714 matching lines @@
 
 class EnsureSpace BASE_EMBEDDED {
  public:
   explicit EnsureSpace(Assembler* assembler) { assembler->CheckBuffer(); }
 };
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_S390_ASSEMBLER_S390_H_