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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/wasm/wasm-macro-gen.h

Issue 1765673002: [wasm] Update {i32,i64}.const to use signed leb128 (Closed) Base URL: http://chromium.googlesource.com/v8/v8.git@master
Patch Set: merge master Created 4 years, 10 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 | « src/wasm/decoder.h ('k') | test/cctest/wasm/test-run-wasm.cc » ('j') | test/unittests/wasm/ast-decoder-unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/wasm/wasm-macro-gen.h
diff --git a/src/wasm/wasm-macro-gen.h b/src/wasm/wasm-macro-gen.h
index 814c268d3416d45164a3b14b3dcc9bd747f9781d..8dc554d4a0a920a4be2b5c369d075ae7c0c96b9b 100644
--- a/src/wasm/wasm-macro-gen.h
+++ b/src/wasm/wasm-macro-gen.h
@@ -52,18 +52,154 @@
#define WASM_ZERO kExprI8Const, 0
#define WASM_ONE kExprI8Const, 1
#define WASM_I8(val) kExprI8Const, static_cast<byte>(val)
-#define WASM_I32(val) \
- kExprI32Const, static_cast<byte>(val), static_cast<byte>(val >> 8), \
- static_cast<byte>(val >> 16), static_cast<byte>(val >> 24)
-#define WASM_I64(val) \
- kExprI64Const, static_cast<byte>(static_cast<uint64_t>(val)), \
- static_cast<byte>(static_cast<uint64_t>(val) >> 8), \
- static_cast<byte>(static_cast<uint64_t>(val) >> 16), \
- static_cast<byte>(static_cast<uint64_t>(val) >> 24), \
- static_cast<byte>(static_cast<uint64_t>(val) >> 32), \
- static_cast<byte>(static_cast<uint64_t>(val) >> 40), \
- static_cast<byte>(static_cast<uint64_t>(val) >> 48), \
- static_cast<byte>(static_cast<uint64_t>(val) >> 56)
+
+//------------------------------------------------------------------------------
+// Int32 Const operations
+//------------------------------------------------------------------------------
+namespace v8 {
+namespace internal {
+namespace wasm {
+
+#define I32V_MIN(length) -(1 << (6 + (7 * ((length) - 1))))
+#define I32V_MAX(length) ((1 << (6 + (7 * ((length) - 1)))) - 1)
+
+#define I32V_IN_RANGE(value, length) \
+ ((value) >= I32V_MIN(length) && (value) <= I32V_MAX(length))
+
+inline void CheckI32v(int32_t value, int length) {
+ DCHECK(length >= 1 && length <= 5);
+ DCHECK(length == 5 || I32V_IN_RANGE(value, length));
+ DCHECK(length == 1 || !I32V_IN_RANGE(value, length - 1));
+}
+
+} // namespace wasm
+} // namespace internal
+} // namespace v8
+
+#define WASM_I32V(val) kExprI32Const, U32V_5(val)
+
+#define WASM_I32V_1(val) \
+ static_cast<byte>(CheckI32v((val), 1), kExprI32Const), U32V_1(val)
+#define WASM_I32V_2(val) \
+ static_cast<byte>(CheckI32v((val), 2), kExprI32Const), U32V_2(val)
+#define WASM_I32V_3(val) \
+ static_cast<byte>(CheckI32v((val), 3), kExprI32Const), U32V_3(val)
+#define WASM_I32V_4(val) \
+ static_cast<byte>(CheckI32v((val), 4), kExprI32Const), U32V_4(val)
+#define WASM_I32V_5(val) \
+ static_cast<byte>(CheckI32v((val), 5), kExprI32Const), U32V_5(val)
+
+//------------------------------------------------------------------------------
+// Int64 Const operations
+//------------------------------------------------------------------------------
+namespace v8 {
titzer 2016/03/03 23:22:52 You can combine these namespaces.
binji 2016/03/03 23:47:32 Sorry, not sure what you mean... is this some new
+namespace internal {
+namespace wasm {
+
+#define I64V_MIN(length) -(1LL << (6 + (7 * ((length)-1))))
+#define I64V_MAX(length) ((1LL << (6 + 7 * ((length)-1))) - 1)
+
+#define I64V_IN_RANGE(value, length) \
+ ((value) >= I64V_MIN(length) && (value) <= I64V_MAX(length))
+
+inline void CheckI64v(int64_t value, int length) {
+ DCHECK(length >= 1 && length <= 10);
+ DCHECK(length == 10 || I64V_IN_RANGE(value, length));
+ DCHECK(length == 1 || !I64V_IN_RANGE(value, length - 1));
+}
+
+} // namespace wasm
+} // namespace internal
+} // namespace v8
+
+#define WASM_I64V(val) \
+ kExprI64Const, static_cast<byte>(((val)&MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 7) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 14) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 21) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 28) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 35) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 42) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 49) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 56) & MASK_7) | 0x80), \
+ static_cast<byte>(((val) >> 63) & MASK_7)
+
+#define WASM_I64V_1(val) \
+ static_cast<byte>(CheckI64v((val), 1), kExprI64Const), \
+ static_cast<byte>((val)&MASK_7)
+#define WASM_I64V_2(val) \
+ static_cast<byte>(CheckI64v((val), 2), kExprI64Const), \
+ static_cast<byte>(((val)&MASK_7) | 0x80), \
+ static_cast<byte>(((val) >> 7) & MASK_7)
+#define WASM_I64V_3(val) \
+ static_cast<byte>(CheckI64v((val), 3), kExprI64Const), \
+ static_cast<byte>(((val)&MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 7) & MASK_7) | 0x80), \
+ static_cast<byte>(((val) >> 14) & MASK_7)
+#define WASM_I64V_4(val) \
+ static_cast<byte>(CheckI64v((val), 4), kExprI64Const), \
+ static_cast<byte>(((val)&MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 7) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 14) & MASK_7) | 0x80), \
+ static_cast<byte>(((val) >> 21) & MASK_7)
+#define WASM_I64V_5(val) \
+ static_cast<byte>(CheckI64v((val), 5), kExprI64Const), \
+ static_cast<byte>(((val)&MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 7) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 14) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 21) & MASK_7) | 0x80), \
+ static_cast<byte>(((val) >> 28) & MASK_7)
+#define WASM_I64V_6(val) \
+ static_cast<byte>(CheckI64v((val), 6), kExprI64Const), \
+ static_cast<byte>(((val)&MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 7) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 14) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 21) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 28) & MASK_7) | 0x80), \
+ static_cast<byte>(((val) >> 35) & MASK_7)
+#define WASM_I64V_7(val) \
+ static_cast<byte>(CheckI64v((val), 7), kExprI64Const), \
+ static_cast<byte>(((val)&MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 7) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 14) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 21) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 28) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 35) & MASK_7) | 0x80), \
+ static_cast<byte>(((val) >> 42) & MASK_7)
+#define WASM_I64V_8(val) \
+ static_cast<byte>(CheckI64v((val), 8), kExprI64Const), \
+ static_cast<byte>(((val)&MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 7) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 14) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 21) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 28) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 35) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 42) & MASK_7) | 0x80), \
+ static_cast<byte>(((val) >> 49) & MASK_7)
+#define WASM_I64V_9(val) \
+ static_cast<byte>(CheckI64v((val), 9), kExprI64Const), \
+ static_cast<byte>(((val)&MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 7) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 14) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 21) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 28) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 35) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 42) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 49) & MASK_7) | 0x80), \
+ static_cast<byte>(((val) >> 56) & MASK_7)
+#define WASM_I64V_10(val) \
+ static_cast<byte>(CheckI64v((val), 10), kExprI64Const), \
+ static_cast<byte>(((val)&MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 7) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 14) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 21) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 28) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 35) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 42) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 49) & MASK_7) | 0x80), \
+ static_cast<byte>((((val) >> 56) & MASK_7) | 0x80), \
+ static_cast<byte>(((val) >> 63) & MASK_7)
+
#define WASM_F32(val) \
kExprF32Const, \
static_cast<byte>(bit_cast<int32_t>(static_cast<float>(val))), \
@@ -303,6 +439,6 @@
static_cast<byte>(((x >> 7) & MASK_7) | 0x80), \
static_cast<byte>(((x >> 14) & MASK_7) | 0x80), \
static_cast<byte>(((x >> 21) & MASK_7) | 0x80), \
- static_cast<byte>((x >> 28) & 0xF)
+ static_cast<byte>(((x >> 28) & MASK_7))
#endif // V8_WASM_MACRO_GEN_H_
« no previous file with comments | « src/wasm/decoder.h ('k') | test/cctest/wasm/test-run-wasm.cc » ('j') | test/unittests/wasm/ast-decoder-unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698