Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(314)

Unified Diff: test/cctest/test-utils-arm64.h

Issue 2819093002: Revert "Reland "ARM64: Add NEON support"" (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « test/cctest/test-simulator-neon-traces-arm64.h ('k') | test/cctest/test-utils-arm64.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/cctest/test-utils-arm64.h
diff --git a/test/cctest/test-utils-arm64.h b/test/cctest/test-utils-arm64.h
index a8a0b0cbf94a1ae9c823a16a5384fd8d01b91eaa..e34365d4c3066beb27d9cae46e9547395852070b 100644
--- a/test/cctest/test-utils-arm64.h
+++ b/test/cctest/test-utils-arm64.h
@@ -39,11 +39,6 @@
namespace v8 {
namespace internal {
-// Structure representing Q registers in a RegisterDump.
-struct vec128_t {
- uint64_t l;
- uint64_t h;
-};
// RegisterDump: Object allowing integer, floating point and flags registers
// to be saved to itself for future reference.
@@ -77,14 +72,14 @@ class RegisterDump {
return dump_.x_[code];
}
- // VRegister accessors.
+ // FPRegister accessors.
inline uint32_t sreg_bits(unsigned code) const {
CHECK(FPRegAliasesMatch(code));
return dump_.s_[code];
}
inline float sreg(unsigned code) const {
- return bit_cast<float>(sreg_bits(code));
+ return rawbits_to_float(sreg_bits(code));
}
inline uint64_t dreg_bits(unsigned code) const {
@@ -93,11 +88,9 @@ class RegisterDump {
}
inline double dreg(unsigned code) const {
- return bit_cast<double>(dreg_bits(code));
+ return rawbits_to_double(dreg_bits(code));
}
- inline vec128_t qreg(unsigned code) const { return dump_.q_[code]; }
-
// Stack pointer accessors.
inline int64_t spreg() const {
CHECK(SPRegAliasesMatch());
@@ -142,7 +135,7 @@ class RegisterDump {
// As RegAliasesMatch, but for floating-point registers.
bool FPRegAliasesMatch(unsigned code) const {
CHECK(IsComplete());
- CHECK(code < kNumberOfVRegisters);
+ CHECK(code < kNumberOfFPRegisters);
return (dump_.d_[code] & kSRegMask) == dump_.s_[code];
}
@@ -154,11 +147,8 @@ class RegisterDump {
uint32_t w_[kNumberOfRegisters];
// Floating-point registers, as raw bits.
- uint64_t d_[kNumberOfVRegisters];
- uint32_t s_[kNumberOfVRegisters];
-
- // Vector registers.
- vec128_t q_[kNumberOfVRegisters];
+ uint64_t d_[kNumberOfFPRegisters];
+ uint32_t s_[kNumberOfFPRegisters];
// The stack pointer.
uint64_t sp_;
@@ -173,18 +163,12 @@ class RegisterDump {
} dump_;
static dump_t for_sizeof();
- static_assert(kXRegSize == kDRegSize, "X and D registers must be same size.");
- static_assert(kWRegSize == kSRegSize, "W and S registers must be same size.");
- static_assert(sizeof(for_sizeof().q_[0]) == kQRegSize,
- "Array elements must be size of Q register.");
- static_assert(sizeof(for_sizeof().d_[0]) == kDRegSize,
- "Array elements must be size of D register.");
- static_assert(sizeof(for_sizeof().s_[0]) == kSRegSize,
- "Array elements must be size of S register.");
- static_assert(sizeof(for_sizeof().x_[0]) == kXRegSize,
- "Array elements must be size of X register.");
- static_assert(sizeof(for_sizeof().w_[0]) == kWRegSize,
- "Array elements must be size of W register.");
+ STATIC_ASSERT(sizeof(for_sizeof().d_[0]) == kDRegSize);
+ STATIC_ASSERT(sizeof(for_sizeof().s_[0]) == kSRegSize);
+ STATIC_ASSERT(sizeof(for_sizeof().d_[0]) == kXRegSize);
+ STATIC_ASSERT(sizeof(for_sizeof().s_[0]) == kWRegSize);
+ STATIC_ASSERT(sizeof(for_sizeof().x_[0]) == kXRegSize);
+ STATIC_ASSERT(sizeof(for_sizeof().w_[0]) == kWRegSize);
};
// Some of these methods don't use the RegisterDump argument, but they have to
@@ -199,14 +183,12 @@ bool Equal32(uint32_t expected, const RegisterDump* core, const Register& reg);
bool Equal64(uint64_t expected, const RegisterDump* core, const Register& reg);
bool EqualFP32(float expected, const RegisterDump* core,
- const VRegister& fpreg);
+ const FPRegister& fpreg);
bool EqualFP64(double expected, const RegisterDump* core,
- const VRegister& fpreg);
+ const FPRegister& fpreg);
bool Equal64(const Register& reg0, const RegisterDump* core,
const Register& reg1);
-bool Equal128(uint64_t expected_h, uint64_t expected_l,
- const RegisterDump* core, const VRegister& reg);
bool EqualNzcv(uint32_t expected, uint32_t result);
@@ -226,8 +208,8 @@ RegList PopulateRegisterArray(Register* w, Register* x, Register* r,
int reg_size, int reg_count, RegList allowed);
// As PopulateRegisterArray, but for floating-point registers.
-RegList PopulateVRegisterArray(VRegister* s, VRegister* d, VRegister* v,
- int reg_size, int reg_count, RegList allowed);
+RegList PopulateFPRegisterArray(FPRegister* s, FPRegister* d, FPRegister* v,
+ int reg_size, int reg_count, RegList allowed);
// Ovewrite the contents of the specified registers. This enables tests to
// check that register contents are written in cases where it's likely that the
« no previous file with comments | « test/cctest/test-simulator-neon-traces-arm64.h ('k') | test/cctest/test-utils-arm64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698