Reviewers: Yang,

Message:
Committed patchset #1 manually as r20142 (tree was closed).

Description:
Revert "Use constant length for memcpy on A64 simulator."

This reverts commit r20141 which broke the build with some GCC versions. The
reason behind that is GCC emits a warning about code which can never be reached,
but GCC can't figure that out.

The right approach would be using template specialization instead of these
runtime if/then/else cascades, which would be nicer from a SW engineering
perspective, too.

[email protected]

Committed: https://code.google.com/p/v8/source/detail?r=20142

Please review this at https://codereview.chromium.org/207703003/

SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge

Affected files (+4, -18 lines):
  M src/a64/simulator-a64.h


Index: src/a64/simulator-a64.h
diff --git a/src/a64/simulator-a64.h b/src/a64/simulator-a64.h
index db585341c1f1b8f1cedfcfc13adec8c6f78f85bb..1ef891a151ecee375870f5e6073f01cc93d1d773 100644
--- a/src/a64/simulator-a64.h
+++ b/src/a64/simulator-a64.h
@@ -166,18 +166,10 @@ class SimRegisterBase {
   void Set(T new_value, unsigned size = sizeof(T)) {
     ASSERT(size <= kSizeInBytes);
     ASSERT(size <= sizeof(new_value));
-    STATIC_ASSERT(kXRegSize == kDRegSize);
-    STATIC_ASSERT(kWRegSize == kSRegSize);
// All AArch64 registers are zero-extending; Writing a W register clears the
     // top bits of the corresponding X register.
-    if (size == kXRegSize) {
-      memcpy(value_, &new_value, kXRegSize);
-    } else if (size == kWRegSize) {
-      memset(value_, 0, kSizeInBytes);
-      memcpy(value_, &new_value, kWRegSize);
-    } else {
-      UNREACHABLE();
-    }
+    memset(value_, 0, kSizeInBytes);
+    memcpy(value_, &new_value, size);
   }

// Copy 'size' bytes of the register to the result, and zero-extend to fill
@@ -186,14 +178,8 @@ class SimRegisterBase {
   T Get(unsigned size = sizeof(T)) const {
     ASSERT(size <= kSizeInBytes);
     T result;
-    if (size == kXRegSize) {
-      memcpy(&result, value_, kXRegSize);
-    } else if (size == kWRegSize) {
-      memset(&result, 0, sizeof(result));
-      memcpy(&result, value_, kWRegSize);
-    } else {
-      UNREACHABLE();
-    }
+    memset(&result, 0, sizeof(result));
+    memcpy(&result, value_, size);
     return result;
   }



--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to