diff options
| author | Alon Zakai <azakai@mozilla.com> | 2010-12-04 20:26:28 -0800 |
|---|---|---|
| committer | Alon Zakai <azakai@mozilla.com> | 2010-12-04 20:26:28 -0800 |
| commit | 7e332b116c930f1bd12a4da10ac1cf4ab21ab024 (patch) | |
| tree | 346b07da2d4bc592a3ae904db3e9069ab134bc27 | |
| parent | 60d8f78f3fc22a9ea96ab09e527760149569d3e2 (diff) | |
fix for bitshifts
| -rw-r--r-- | src/jsifier.js | 5 | ||||
| -rw-r--r-- | src/library.js | 1 | ||||
| -rw-r--r-- | src/preamble.js | 3 | ||||
| -rw-r--r-- | tests/runner.py | 13 |
4 files changed, 18 insertions, 4 deletions
diff --git a/src/jsifier.js b/src/jsifier.js index b504cb9d..b5ac1262 100644 --- a/src/jsifier.js +++ b/src/jsifier.js @@ -717,8 +717,9 @@ function JSify(data, functionsOnly, givenTypes, givenFunctions) { case 'or': return ident1 + ' | ' + ident2; case 'and': return ident1 + ' & ' + ident2; case 'xor': return ident1 + ' ^ ' + ident2; - case 'shl': case 'ashl': case 'lshl': return ident1 + ' << ' + ident2; - case 'shr': case 'ashr': case 'lshr': return ident1 + ' >> ' + ident2; + case 'shl': return ident1 + ' << ' + ident2; + case 'ashr': return ident1 + ' >> ' + ident2; + case 'lshr': return ident1 + ' >>> ' + ident2; case 'fadd': return ident1 + ' + ' + ident2; case 'fsub': return ident1 + ' - ' + ident2; case 'fdiv': return ident1 + ' / ' + ident2; diff --git a/src/library.js b/src/library.js index 49c1bdc8..370a5b1a 100644 --- a/src/library.js +++ b/src/library.js @@ -151,7 +151,6 @@ var Library = { keys.sort(function(a, b) { return comparator(base+a*size, base+b*size); }); - print("KEYS:" + keys) // apply the sort var temp = _malloc(num*size); _memcpy(temp, base, num*size); diff --git a/src/preamble.js b/src/preamble.js index f959e89f..c816fd57 100644 --- a/src/preamble.js +++ b/src/preamble.js @@ -358,6 +358,9 @@ function llvm_memset_i32(ptr, value, num) { #else HEAP[ptr+i] = value; #endif +#if SAFE_HEAP + SAFE_HEAP_ACCESS(ptr+i, null, true); +#endif } } _llvm_memset_p0i8_i64 = _llvm_memset_p0i8_i32 = llvm_memset_i32; diff --git a/tests/runner.py b/tests/runner.py index 14b1f2a4..d8267d2e 100644 --- a/tests/runner.py +++ b/tests/runner.py @@ -171,10 +171,21 @@ if 'benchmark' not in sys.argv: int p = h; p &= 0; printf("*%d,%d,%d,%d,%d,%d,%d,%d,%d*\\n", x, y, z, w, k, i, j, h, p); + + long hash = -1; + size_t perturb; + int ii = 0; + for (perturb = hash; ; perturb >>= 5) { + printf("%d:%d", ii, perturb); + ii++; + if (ii == 9) break; + printf(","); + } + printf("*\\n"); return 0; } ''' - self.do_test(src, '*5,23,10,19,121,1,37,1,0*') + self.do_test(src, '*5,23,10,19,121,1,37,1,0*\n0:-1,1:134217727,2:4194303,3:131071,4:4095,5:127,6:3,7:0,8:0*') def test_unsigned(self): src = ''' |