s390: cleanup s390 opcode table

src/s390/simulator-s390.h

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Declares a Simulator for S390 instructions if we are not generating a native
 // S390 binary. This Simulator allows us to run and debug S390 code generation
 // on regular desktop machines.
 // V8 calls into generated code by "calling" the CALL_GENERATED_CODE macro,
 // which will start execution in the Simulator or forwards to the real entry
 // on a S390 hardware platform.
@@ skipping 505 matching lines @@
   int DecodeInstruction(Instruction* instr);
   int Evaluate_Unknown(Instruction* instr);
 #define MAX_NUM_OPCODES (1 << 16)
   typedef int (Simulator::*EvaluateFuncType)(Instruction*);
 
   static EvaluateFuncType EvalTable[MAX_NUM_OPCODES];
   static void EvalTableInit();
 
 #define EVALUATE(name) int Evaluate_##name(Instruction* instr)
 #define EVALUATE_VRR_INSTRUCTIONS(name, op_name, op_value) EVALUATE(op_name);
-  VRR_C_OPCODE_LIST(EVALUATE_VRR_INSTRUCTIONS)
-  VRR_A_OPCODE_LIST(EVALUATE_VRR_INSTRUCTIONS)
+  S390_VRR_C_OPCODE_LIST(EVALUATE_VRR_INSTRUCTIONS)
+  S390_VRR_A_OPCODE_LIST(EVALUATE_VRR_INSTRUCTIONS)
 #undef EVALUATE_VRR_INSTRUCTIONS
 
   EVALUATE(DUMY);
   EVALUATE(BKPT);
   EVALUATE(SPM);
   EVALUATE(BALR);
   EVALUATE(BCTR);
   EVALUATE(BCR);
   EVALUATE(SVC);
   EVALUATE(BSM);
@@ skipping 751 matching lines @@
   static inline void UnregisterCTryCatch(v8::internal::Isolate* isolate) {
     Simulator::current(isolate)->PopAddress();
   }
 };
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // !defined(USE_SIMULATOR)
 #endif  // V8_S390_SIMULATOR_S390_H_