| Index: src/ppc/simulator-ppc.h
|
| diff --git a/src/arm/simulator-arm.h b/src/ppc/simulator-ppc.h
|
| similarity index 59%
|
| copy from src/arm/simulator-arm.h
|
| copy to src/ppc/simulator-ppc.h
|
| index 76865bcf2ac371391878270667bb946563979ac7..3350d9a7490f8c71d9ddf90083ab41b3b04f91cd 100644
|
| --- a/src/arm/simulator-arm.h
|
| +++ b/src/ppc/simulator-ppc.h
|
| @@ -1,22 +1,25 @@
|
| // Copyright 2012 the V8 project authors. All rights reserved.
|
| +//
|
| +// Copyright IBM Corp. 2012, 2013. 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 ARM instructions if we are not generating a native
|
| -// ARM binary. This Simulator allows us to run and debug ARM code generation on
|
| +// Declares a Simulator for PPC instructions if we are not generating a native
|
| +// PPC binary. This Simulator allows us to run and debug PPC 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 ARM HW platform.
|
| +// on a PPC HW platform.
|
|
|
| -#ifndef V8_ARM_SIMULATOR_ARM_H_
|
| -#define V8_ARM_SIMULATOR_ARM_H_
|
| +#ifndef V8_PPC_SIMULATOR_PPC_H_
|
| +#define V8_PPC_SIMULATOR_PPC_H_
|
|
|
| #include "src/allocation.h"
|
|
|
| #if !defined(USE_SIMULATOR)
|
| -// Running without a simulator on a native arm platform.
|
| +// Running without a simulator on a native ppc platform.
|
|
|
| namespace v8 {
|
| namespace internal {
|
| @@ -25,20 +28,20 @@ namespace internal {
|
| #define CALL_GENERATED_CODE(entry, p0, p1, p2, p3, p4) \
|
| (entry(p0, p1, p2, p3, p4))
|
|
|
| -typedef int (*arm_regexp_matcher)(String*, int, const byte*, const byte*,
|
| - void*, int*, int, Address, int, Isolate*);
|
| +typedef int (*ppc_regexp_matcher)(String*, int, const byte*, const byte*,
|
| + int*, int, Address, int, void*, Isolate*);
|
|
|
|
|
| // Call the generated regexp code directly. The code at the entry address
|
| -// should act as a function matching the type arm_regexp_matcher.
|
| -// The fifth argument is a dummy that reserves the space used for
|
| +// should act as a function matching the type ppc_regexp_matcher.
|
| +// The ninth argument is a dummy that reserves the space used for
|
| // the return address added by the ExitFrame in native calls.
|
| #define CALL_GENERATED_REGEXP_CODE(entry, p0, p1, p2, p3, p4, p5, p6, p7, p8) \
|
| - (FUNCTION_CAST<arm_regexp_matcher>(entry)( \
|
| - p0, p1, p2, p3, NULL, p4, p5, p6, p7, p8))
|
| + (FUNCTION_CAST<ppc_regexp_matcher>(entry)( \
|
| + p0, p1, p2, p3, p4, p5, p6, p7, NULL, p8))
|
|
|
| // The stack limit beyond which we will throw stack overflow errors in
|
| -// generated code. Because generated code on arm uses the C stack, we
|
| +// generated code. Because generated code on ppc uses the C stack, we
|
| // just use the C stack limit.
|
| class SimulatorStack : public v8::internal::AllStatic {
|
| public:
|
| @@ -60,9 +63,9 @@ class SimulatorStack : public v8::internal::AllStatic {
|
| #else // !defined(USE_SIMULATOR)
|
| // Running with a simulator.
|
|
|
| -#include "src/arm/constants-arm.h"
|
| #include "src/assembler.h"
|
| #include "src/hashmap.h"
|
| +#include "src/ppc/constants-ppc.h"
|
|
|
| namespace v8 {
|
| namespace internal {
|
| @@ -100,28 +103,19 @@ class CachePage {
|
|
|
| class Simulator {
|
| public:
|
| - friend class ArmDebugger;
|
| + friend class PPCDebugger;
|
| enum Register {
|
| no_reg = -1,
|
| - r0 = 0, r1, r2, r3, r4, r5, r6, r7,
|
| + r0 = 0, sp, r2, r3, r4, r5, r6, r7,
|
| r8, r9, r10, r11, r12, r13, r14, r15,
|
| - num_registers,
|
| - sp = 13,
|
| - lr = 14,
|
| - pc = 15,
|
| - s0 = 0, s1, s2, s3, s4, s5, s6, s7,
|
| - s8, s9, s10, s11, s12, s13, s14, s15,
|
| - s16, s17, s18, s19, s20, s21, s22, s23,
|
| - s24, s25, s26, s27, s28, s29, s30, s31,
|
| - num_s_registers = 32,
|
| + r16, r17, r18, r19, r20, r21, r22, r23,
|
| + r24, r25, r26, r27, r28, r29, r30, fp,
|
| + kNumGPRs = 32,
|
| d0 = 0, d1, d2, d3, d4, d5, d6, d7,
|
| d8, d9, d10, d11, d12, d13, d14, d15,
|
| d16, d17, d18, d19, d20, d21, d22, d23,
|
| d24, d25, d26, d27, d28, d29, d30, d31,
|
| - num_d_registers = 32,
|
| - q0 = 0, q1, q2, q3, q4, q5, q6, q7,
|
| - q8, q9, q10, q11, q12, q13, q14, q15,
|
| - num_q_registers = 16
|
| + kNumFPRs = 32
|
| };
|
|
|
| explicit Simulator(Isolate* isolate);
|
| @@ -131,55 +125,21 @@ class Simulator {
|
| // for each native thread.
|
| static Simulator* current(v8::internal::Isolate* isolate);
|
|
|
| - // Accessors for register state. Reading the pc value adheres to the ARM
|
| - // architecture specification and is off by a 8 from the currently executing
|
| - // instruction.
|
| - void set_register(int reg, int32_t value);
|
| - int32_t get_register(int reg) const;
|
| + // Accessors for register state.
|
| + void set_register(int reg, intptr_t value);
|
| + intptr_t get_register(int reg) const;
|
| double get_double_from_register_pair(int reg);
|
| - void set_register_pair_from_double(int reg, double* value);
|
| - void set_dw_register(int dreg, const int* dbl);
|
| -
|
| - // Support for VFP.
|
| - void get_d_register(int dreg, uint64_t* value);
|
| - void set_d_register(int dreg, const uint64_t* value);
|
| - void get_d_register(int dreg, uint32_t* value);
|
| - void set_d_register(int dreg, const uint32_t* value);
|
| - void get_q_register(int qreg, uint64_t* value);
|
| - void set_q_register(int qreg, const uint64_t* value);
|
| - void get_q_register(int qreg, uint32_t* value);
|
| - void set_q_register(int qreg, const uint32_t* value);
|
| -
|
| - void set_s_register(int reg, unsigned int value);
|
| - unsigned int get_s_register(int reg) const;
|
| -
|
| - void set_d_register_from_double(int dreg, const double& dbl) {
|
| - SetVFPRegister<double, 2>(dreg, dbl);
|
| + void set_d_register_from_double(int dreg, const double dbl) {
|
| + DCHECK(dreg >= 0 && dreg < kNumFPRs);
|
| + fp_registers_[dreg] = dbl;
|
| }
|
| -
|
| double get_double_from_d_register(int dreg) {
|
| - return GetFromVFPRegister<double, 2>(dreg);
|
| - }
|
| -
|
| - void set_s_register_from_float(int sreg, const float flt) {
|
| - SetVFPRegister<float, 1>(sreg, flt);
|
| - }
|
| -
|
| - float get_float_from_s_register(int sreg) {
|
| - return GetFromVFPRegister<float, 1>(sreg);
|
| - }
|
| -
|
| - void set_s_register_from_sinteger(int sreg, const int sint) {
|
| - SetVFPRegister<int, 1>(sreg, sint);
|
| - }
|
| -
|
| - int get_sinteger_from_s_register(int sreg) {
|
| - return GetFromVFPRegister<int, 1>(sreg);
|
| + return fp_registers_[dreg];
|
| }
|
|
|
| // Special case of set_register and get_register to access the raw PC value.
|
| - void set_pc(int32_t value);
|
| - int32_t get_pc() const;
|
| + void set_pc(intptr_t value);
|
| + intptr_t get_pc() const;
|
|
|
| Address get_sp() {
|
| return reinterpret_cast<Address>(static_cast<intptr_t>(get_register(sp)));
|
| @@ -188,7 +148,7 @@ class Simulator {
|
| // Accessor to the internal simulator stack area.
|
| uintptr_t StackLimit() const;
|
|
|
| - // Executes ARM instructions until the PC reaches end_sim_pc.
|
| + // Executes PPC instructions until the PC reaches end_sim_pc.
|
| void Execute();
|
|
|
| // Call on program start.
|
| @@ -197,7 +157,7 @@ class Simulator {
|
| // V8 generally calls into generated JS code with 5 parameters and into
|
| // generated RegExp code with 7 parameters. This is a convenience function,
|
| // which sets up the simulator state and grabs the result on return.
|
| - int32_t Call(byte* entry, int argument_count, ...);
|
| + intptr_t Call(byte* entry, int argument_count, ...);
|
| // Alternative: call a 2-argument double function.
|
| void CallFP(byte* entry, double d0, double d1);
|
| int32_t CallFPReturnsInt(byte* entry, double d0, double d1);
|
| @@ -221,15 +181,6 @@ class Simulator {
|
| // below (bad_lr, end_sim_pc).
|
| bool has_bad_pc() const;
|
|
|
| - // EABI variant for double arguments in use.
|
| - bool use_eabi_hardfloat() {
|
| -#if USE_EABI_HARDFLOAT
|
| - return true;
|
| -#else
|
| - return false;
|
| -#endif
|
| - }
|
| -
|
| private:
|
| enum special_values {
|
| // Known bad pc value to ensure that the simulator does not execute
|
| @@ -245,14 +196,7 @@ class Simulator {
|
| // Unsupported instructions use Format to print an error and stop execution.
|
| void Format(Instruction* instr, const char* format);
|
|
|
| - // Checks if the current instruction should be executed based on its
|
| - // condition bits.
|
| - inline bool ConditionallyExecute(Instruction* instr);
|
| -
|
| // Helper functions to set the conditional flags in the architecture state.
|
| - void SetNZFlags(int32_t val);
|
| - void SetCFlag(bool val);
|
| - void SetVFlag(bool val);
|
| bool CarryFrom(int32_t left, int32_t right, int32_t carry = 0);
|
| bool BorrowFrom(int32_t left, int32_t right);
|
| bool OverflowFrom(int32_t alu_out,
|
| @@ -260,23 +204,14 @@ class Simulator {
|
| int32_t right,
|
| bool addition);
|
|
|
| - inline int GetCarry() {
|
| - return c_flag_ ? 1 : 0;
|
| - }
|
| -
|
| - // Support for VFP.
|
| - void Compute_FPSCR_Flags(double val1, double val2);
|
| - void Copy_FPSCR_to_APSR();
|
| - inline double canonicalizeNaN(double value);
|
| -
|
| // Helper functions to decode common "addressing" modes
|
| int32_t GetShiftRm(Instruction* instr, bool* carry_out);
|
| int32_t GetImm(Instruction* instr, bool* carry_out);
|
| - int32_t ProcessPU(Instruction* instr,
|
| - int num_regs,
|
| - int operand_size,
|
| - intptr_t* start_address,
|
| - intptr_t* end_address);
|
| + void ProcessPUW(Instruction* instr,
|
| + int num_regs,
|
| + int operand_size,
|
| + intptr_t* start_address,
|
| + intptr_t* end_address);
|
| void HandleRList(Instruction* instr, bool load);
|
| void HandleVList(Instruction* inst);
|
| void SoftwareInterrupt(Instruction* instr);
|
| @@ -291,45 +226,41 @@ class Simulator {
|
| void PrintStopInfo(uint32_t code);
|
|
|
| // Read and write memory.
|
| - inline uint8_t ReadBU(int32_t addr);
|
| - inline int8_t ReadB(int32_t addr);
|
| - inline void WriteB(int32_t addr, uint8_t value);
|
| - inline void WriteB(int32_t addr, int8_t value);
|
| + inline uint8_t ReadBU(intptr_t addr);
|
| + inline int8_t ReadB(intptr_t addr);
|
| + inline void WriteB(intptr_t addr, uint8_t value);
|
| + inline void WriteB(intptr_t addr, int8_t value);
|
|
|
| - inline uint16_t ReadHU(int32_t addr, Instruction* instr);
|
| - inline int16_t ReadH(int32_t addr, Instruction* instr);
|
| + inline uint16_t ReadHU(intptr_t addr, Instruction* instr);
|
| + inline int16_t ReadH(intptr_t addr, Instruction* instr);
|
| // Note: Overloaded on the sign of the value.
|
| - inline void WriteH(int32_t addr, uint16_t value, Instruction* instr);
|
| - inline void WriteH(int32_t addr, int16_t value, Instruction* instr);
|
| -
|
| - inline int ReadW(int32_t addr, Instruction* instr);
|
| - inline void WriteW(int32_t addr, int value, Instruction* instr);
|
| -
|
| - int32_t* ReadDW(int32_t addr);
|
| - void WriteDW(int32_t addr, int32_t value1, int32_t value2);
|
| -
|
| - // Executing is handled based on the instruction type.
|
| - // Both type 0 and type 1 rolled into one.
|
| - void DecodeType01(Instruction* instr);
|
| - void DecodeType2(Instruction* instr);
|
| - void DecodeType3(Instruction* instr);
|
| - void DecodeType4(Instruction* instr);
|
| - void DecodeType5(Instruction* instr);
|
| - void DecodeType6(Instruction* instr);
|
| - void DecodeType7(Instruction* instr);
|
| -
|
| - // Support for VFP.
|
| - void DecodeTypeVFP(Instruction* instr);
|
| - void DecodeType6CoprocessorIns(Instruction* instr);
|
| - void DecodeSpecialCondition(Instruction* instr);
|
| -
|
| - void DecodeVMOVBetweenCoreAndSinglePrecisionRegisters(Instruction* instr);
|
| - void DecodeVCMP(Instruction* instr);
|
| - void DecodeVCVTBetweenDoubleAndSingle(Instruction* instr);
|
| - void DecodeVCVTBetweenFloatingPointAndInteger(Instruction* instr);
|
| + inline void WriteH(intptr_t addr, uint16_t value, Instruction* instr);
|
| + inline void WriteH(intptr_t addr, int16_t value, Instruction* instr);
|
| +
|
| + inline uint32_t ReadWU(intptr_t addr, Instruction* instr);
|
| + inline int32_t ReadW(intptr_t addr, Instruction* instr);
|
| + inline void WriteW(intptr_t addr, uint32_t value, Instruction* instr);
|
| + inline void WriteW(intptr_t addr, int32_t value, Instruction* instr);
|
| +
|
| + intptr_t* ReadDW(intptr_t addr);
|
| + void WriteDW(intptr_t addr, int64_t value);
|
| +
|
| + void Trace(Instruction* instr);
|
| + void SetCR0(intptr_t result, bool setSO = false);
|
| + void ExecuteBranchConditional(Instruction* instr);
|
| + void ExecuteExt1(Instruction* instr);
|
| + bool ExecuteExt2_10bit(Instruction* instr);
|
| + bool ExecuteExt2_9bit_part1(Instruction* instr);
|
| + void ExecuteExt2_9bit_part2(Instruction* instr);
|
| + void ExecuteExt2(Instruction* instr);
|
| + void ExecuteExt4(Instruction* instr);
|
| +#if V8_TARGET_ARCH_PPC64
|
| + void ExecuteExt5(Instruction* instr);
|
| +#endif
|
| + void ExecuteGeneric(Instruction* instr);
|
|
|
| // Executes one instruction.
|
| - void InstructionDecode(Instruction* instr);
|
| + void ExecuteInstruction(Instruction* instr);
|
|
|
| // ICache.
|
| static void CheckICache(v8::internal::HashMap* i_cache, Instruction* instr);
|
| @@ -343,45 +274,25 @@ class Simulator {
|
| v8::internal::ExternalReference::Type type);
|
|
|
| // Handle arguments and return value for runtime FP functions.
|
| - void GetFpArgs(double* x, double* y, int32_t* z);
|
| + void GetFpArgs(double* x, double* y, intptr_t* z);
|
| void SetFpResult(const double& result);
|
| void TrashCallerSaveRegisters();
|
|
|
| - template<class ReturnType, int register_size>
|
| - ReturnType GetFromVFPRegister(int reg_index);
|
| -
|
| - template<class InputType, int register_size>
|
| - void SetVFPRegister(int reg_index, const InputType& value);
|
| -
|
| void CallInternal(byte* entry);
|
|
|
| // Architecture state.
|
| // Saturating instructions require a Q flag to indicate saturation.
|
| // There is currently no way to read the CPSR directly, and thus read the Q
|
| // flag, so this is left unimplemented.
|
| - int32_t registers_[16];
|
| - bool n_flag_;
|
| - bool z_flag_;
|
| - bool c_flag_;
|
| - bool v_flag_;
|
| -
|
| - // VFP architecture state.
|
| - unsigned int vfp_registers_[num_d_registers * 2];
|
| - bool n_flag_FPSCR_;
|
| - bool z_flag_FPSCR_;
|
| - bool c_flag_FPSCR_;
|
| - bool v_flag_FPSCR_;
|
| -
|
| - // VFP rounding mode. See ARM DDI 0406B Page A2-29.
|
| - VFPRoundingMode FPSCR_rounding_mode_;
|
| - bool FPSCR_default_NaN_mode_;
|
| -
|
| - // VFP FP exception flags architecture state.
|
| - bool inv_op_vfp_flag_;
|
| - bool div_zero_vfp_flag_;
|
| - bool overflow_vfp_flag_;
|
| - bool underflow_vfp_flag_;
|
| - bool inexact_vfp_flag_;
|
| + intptr_t registers_[kNumGPRs];
|
| + int32_t condition_reg_;
|
| + int32_t fp_condition_reg_;
|
| + intptr_t special_reg_lr_;
|
| + intptr_t special_reg_pc_;
|
| + intptr_t special_reg_ctr_;
|
| + int32_t special_reg_xer_;
|
| +
|
| + double fp_registers_[kNumFPRs];
|
|
|
| // Simulator support.
|
| char* stack_;
|
| @@ -423,15 +334,26 @@ class Simulator {
|
| // point.
|
| #define CALL_GENERATED_CODE(entry, p0, p1, p2, p3, p4) \
|
| reinterpret_cast<Object*>(Simulator::current(Isolate::Current())->Call( \
|
| - FUNCTION_ADDR(entry), 5, p0, p1, p2, p3, p4))
|
| -
|
| -#define CALL_GENERATED_FP_INT(entry, p0, p1) \
|
| - Simulator::current(Isolate::Current())->CallFPReturnsInt( \
|
| - FUNCTION_ADDR(entry), p0, p1)
|
| + FUNCTION_ADDR(entry), 5, \
|
| + (intptr_t)p0, \
|
| + (intptr_t)p1, \
|
| + (intptr_t)p2, \
|
| + (intptr_t)p3, \
|
| + (intptr_t)p4))
|
|
|
| #define CALL_GENERATED_REGEXP_CODE(entry, p0, p1, p2, p3, p4, p5, p6, p7, p8) \
|
| - Simulator::current(Isolate::Current())->Call( \
|
| - entry, 10, p0, p1, p2, p3, NULL, p4, p5, p6, p7, p8)
|
| + Simulator::current(Isolate::Current())->Call( \
|
| + entry, 10, \
|
| + (intptr_t)p0, \
|
| + (intptr_t)p1, \
|
| + (intptr_t)p2, \
|
| + (intptr_t)p3, \
|
| + (intptr_t)p4, \
|
| + (intptr_t)p5, \
|
| + (intptr_t)p6, \
|
| + (intptr_t)p7, \
|
| + (intptr_t)NULL, \
|
| + (intptr_t)p8)
|
|
|
|
|
| // The simulator has its own stack. Thus it has a different stack limit from
|
| @@ -459,4 +381,4 @@ class SimulatorStack : public v8::internal::AllStatic {
|
| } } // namespace v8::internal
|
|
|
| #endif // !defined(USE_SIMULATOR)
|
| -#endif // V8_ARM_SIMULATOR_ARM_H_
|
| +#endif // V8_PPC_SIMULATOR_PPC_H_
|
|
|