ARM: Rename Simulator::vfp_register to vfp_registers_
This matches Simulator::registers_ and is in line with the style guide. BUG=none Review URL: https://chromiumcodereview.appspot.com/12096036 Patch from Hans Wennborg <hans@chromium.org>. git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@13547 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
2a5d46dd1e
commit
d16c2d6093
@ -766,7 +766,7 @@ Simulator::Simulator(Isolate* isolate) : isolate_(isolate) {
|
|||||||
// even though s_registers_ & d_registers_ share the same
|
// even though s_registers_ & d_registers_ share the same
|
||||||
// physical registers in the target.
|
// physical registers in the target.
|
||||||
for (int i = 0; i < num_d_registers * 2; i++) {
|
for (int i = 0; i < num_d_registers * 2; i++) {
|
||||||
vfp_register[i] = 0;
|
vfp_registers_[i] = 0;
|
||||||
}
|
}
|
||||||
n_flag_FPSCR_ = false;
|
n_flag_FPSCR_ = false;
|
||||||
z_flag_FPSCR_ = false;
|
z_flag_FPSCR_ = false;
|
||||||
@ -901,7 +901,7 @@ double Simulator::get_double_from_register_pair(int reg) {
|
|||||||
double dm_val = 0.0;
|
double dm_val = 0.0;
|
||||||
// Read the bits from the unsigned integer register_[] array
|
// Read the bits from the unsigned integer register_[] array
|
||||||
// into the double precision floating point value and return it.
|
// into the double precision floating point value and return it.
|
||||||
char buffer[2 * sizeof(vfp_register[0])];
|
char buffer[2 * sizeof(vfp_registers_[0])];
|
||||||
memcpy(buffer, ®isters_[reg], 2 * sizeof(registers_[0]));
|
memcpy(buffer, ®isters_[reg], 2 * sizeof(registers_[0]));
|
||||||
memcpy(&dm_val, buffer, 2 * sizeof(registers_[0]));
|
memcpy(&dm_val, buffer, 2 * sizeof(registers_[0]));
|
||||||
return(dm_val);
|
return(dm_val);
|
||||||
@ -936,13 +936,13 @@ int32_t Simulator::get_pc() const {
|
|||||||
// Getting from and setting into VFP registers.
|
// Getting from and setting into VFP registers.
|
||||||
void Simulator::set_s_register(int sreg, unsigned int value) {
|
void Simulator::set_s_register(int sreg, unsigned int value) {
|
||||||
ASSERT((sreg >= 0) && (sreg < num_s_registers));
|
ASSERT((sreg >= 0) && (sreg < num_s_registers));
|
||||||
vfp_register[sreg] = value;
|
vfp_registers_[sreg] = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
unsigned int Simulator::get_s_register(int sreg) const {
|
unsigned int Simulator::get_s_register(int sreg) const {
|
||||||
ASSERT((sreg >= 0) && (sreg < num_s_registers));
|
ASSERT((sreg >= 0) && (sreg < num_s_registers));
|
||||||
return vfp_register[sreg];
|
return vfp_registers_[sreg];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -952,10 +952,10 @@ void Simulator::SetVFPRegister(int reg_index, const InputType& value) {
|
|||||||
if (register_size == 1) ASSERT(reg_index < num_s_registers);
|
if (register_size == 1) ASSERT(reg_index < num_s_registers);
|
||||||
if (register_size == 2) ASSERT(reg_index < DwVfpRegister::NumRegisters());
|
if (register_size == 2) ASSERT(reg_index < DwVfpRegister::NumRegisters());
|
||||||
|
|
||||||
char buffer[register_size * sizeof(vfp_register[0])];
|
char buffer[register_size * sizeof(vfp_registers_[0])];
|
||||||
memcpy(buffer, &value, register_size * sizeof(vfp_register[0]));
|
memcpy(buffer, &value, register_size * sizeof(vfp_registers_[0]));
|
||||||
memcpy(&vfp_register[reg_index * register_size], buffer,
|
memcpy(&vfp_registers_[reg_index * register_size], buffer,
|
||||||
register_size * sizeof(vfp_register[0]));
|
register_size * sizeof(vfp_registers_[0]));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -966,10 +966,10 @@ ReturnType Simulator::GetFromVFPRegister(int reg_index) {
|
|||||||
if (register_size == 2) ASSERT(reg_index < DwVfpRegister::NumRegisters());
|
if (register_size == 2) ASSERT(reg_index < DwVfpRegister::NumRegisters());
|
||||||
|
|
||||||
ReturnType value = 0;
|
ReturnType value = 0;
|
||||||
char buffer[register_size * sizeof(vfp_register[0])];
|
char buffer[register_size * sizeof(vfp_registers_[0])];
|
||||||
memcpy(buffer, &vfp_register[register_size * reg_index],
|
memcpy(buffer, &vfp_registers_[register_size * reg_index],
|
||||||
register_size * sizeof(vfp_register[0]));
|
register_size * sizeof(vfp_registers_[0]));
|
||||||
memcpy(&value, buffer, register_size * sizeof(vfp_register[0]));
|
memcpy(&value, buffer, register_size * sizeof(vfp_registers_[0]));
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -978,8 +978,8 @@ ReturnType Simulator::GetFromVFPRegister(int reg_index) {
|
|||||||
// from r0-r3 or d0 and d1.
|
// from r0-r3 or d0 and d1.
|
||||||
void Simulator::GetFpArgs(double* x, double* y) {
|
void Simulator::GetFpArgs(double* x, double* y) {
|
||||||
if (use_eabi_hardfloat()) {
|
if (use_eabi_hardfloat()) {
|
||||||
*x = vfp_register[0];
|
*x = vfp_registers_[0];
|
||||||
*y = vfp_register[1];
|
*y = vfp_registers_[1];
|
||||||
} else {
|
} else {
|
||||||
// We use a char buffer to get around the strict-aliasing rules which
|
// We use a char buffer to get around the strict-aliasing rules which
|
||||||
// otherwise allow the compiler to optimize away the copy.
|
// otherwise allow the compiler to optimize away the copy.
|
||||||
@ -997,7 +997,7 @@ void Simulator::GetFpArgs(double* x, double* y) {
|
|||||||
// from r0 and r1 or d0.
|
// from r0 and r1 or d0.
|
||||||
void Simulator::GetFpArgs(double* x) {
|
void Simulator::GetFpArgs(double* x) {
|
||||||
if (use_eabi_hardfloat()) {
|
if (use_eabi_hardfloat()) {
|
||||||
*x = vfp_register[0];
|
*x = vfp_registers_[0];
|
||||||
} else {
|
} else {
|
||||||
// We use a char buffer to get around the strict-aliasing rules which
|
// We use a char buffer to get around the strict-aliasing rules which
|
||||||
// otherwise allow the compiler to optimize away the copy.
|
// otherwise allow the compiler to optimize away the copy.
|
||||||
@ -1013,7 +1013,7 @@ void Simulator::GetFpArgs(double* x) {
|
|||||||
// from r0 and r1 or d0 and one integer value.
|
// from r0 and r1 or d0 and one integer value.
|
||||||
void Simulator::GetFpArgs(double* x, int32_t* y) {
|
void Simulator::GetFpArgs(double* x, int32_t* y) {
|
||||||
if (use_eabi_hardfloat()) {
|
if (use_eabi_hardfloat()) {
|
||||||
*x = vfp_register[0];
|
*x = vfp_registers_[0];
|
||||||
*y = registers_[1];
|
*y = registers_[1];
|
||||||
} else {
|
} else {
|
||||||
// We use a char buffer to get around the strict-aliasing rules which
|
// We use a char buffer to get around the strict-aliasing rules which
|
||||||
@ -1032,10 +1032,10 @@ void Simulator::GetFpArgs(double* x, int32_t* y) {
|
|||||||
// The return value is either in r0/r1 or d0.
|
// The return value is either in r0/r1 or d0.
|
||||||
void Simulator::SetFpResult(const double& result) {
|
void Simulator::SetFpResult(const double& result) {
|
||||||
if (use_eabi_hardfloat()) {
|
if (use_eabi_hardfloat()) {
|
||||||
char buffer[2 * sizeof(vfp_register[0])];
|
char buffer[2 * sizeof(vfp_registers_[0])];
|
||||||
memcpy(buffer, &result, sizeof(buffer));
|
memcpy(buffer, &result, sizeof(buffer));
|
||||||
// Copy result to d0.
|
// Copy result to d0.
|
||||||
memcpy(vfp_register, buffer, sizeof(buffer));
|
memcpy(vfp_registers_, buffer, sizeof(buffer));
|
||||||
} else {
|
} else {
|
||||||
char buffer[2 * sizeof(registers_[0])];
|
char buffer[2 * sizeof(registers_[0])];
|
||||||
memcpy(buffer, &result, sizeof(buffer));
|
memcpy(buffer, &result, sizeof(buffer));
|
||||||
@ -1692,18 +1692,18 @@ void Simulator::SoftwareInterrupt(Instruction* instr) {
|
|||||||
switch (redirection->type()) {
|
switch (redirection->type()) {
|
||||||
case ExternalReference::BUILTIN_FP_FP_CALL:
|
case ExternalReference::BUILTIN_FP_FP_CALL:
|
||||||
case ExternalReference::BUILTIN_COMPARE_CALL:
|
case ExternalReference::BUILTIN_COMPARE_CALL:
|
||||||
arg0 = vfp_register[0];
|
arg0 = vfp_registers_[0];
|
||||||
arg1 = vfp_register[1];
|
arg1 = vfp_registers_[1];
|
||||||
arg2 = vfp_register[2];
|
arg2 = vfp_registers_[2];
|
||||||
arg3 = vfp_register[3];
|
arg3 = vfp_registers_[3];
|
||||||
break;
|
break;
|
||||||
case ExternalReference::BUILTIN_FP_CALL:
|
case ExternalReference::BUILTIN_FP_CALL:
|
||||||
arg0 = vfp_register[0];
|
arg0 = vfp_registers_[0];
|
||||||
arg1 = vfp_register[1];
|
arg1 = vfp_registers_[1];
|
||||||
break;
|
break;
|
||||||
case ExternalReference::BUILTIN_FP_INT_CALL:
|
case ExternalReference::BUILTIN_FP_INT_CALL:
|
||||||
arg0 = vfp_register[0];
|
arg0 = vfp_registers_[0];
|
||||||
arg1 = vfp_register[1];
|
arg1 = vfp_registers_[1];
|
||||||
arg2 = get_register(0);
|
arg2 = get_register(0);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -373,8 +373,7 @@ class Simulator {
|
|||||||
bool v_flag_;
|
bool v_flag_;
|
||||||
|
|
||||||
// VFP architecture state.
|
// VFP architecture state.
|
||||||
// TODO(hans): Rename vfp_register to vfp_registers_.
|
unsigned int vfp_registers_[num_d_registers * 2];
|
||||||
unsigned int vfp_register[num_d_registers * 2];
|
|
||||||
bool n_flag_FPSCR_;
|
bool n_flag_FPSCR_;
|
||||||
bool z_flag_FPSCR_;
|
bool z_flag_FPSCR_;
|
||||||
bool c_flag_FPSCR_;
|
bool c_flag_FPSCR_;
|
||||||
|
Loading…
Reference in New Issue
Block a user