diff options
| author | Alon Zakai <azakai@mozilla.com> | 2010-12-05 17:30:45 -0800 |
|---|---|---|
| committer | Alon Zakai <azakai@mozilla.com> | 2010-12-05 17:30:45 -0800 |
| commit | cb23e4c23c63bf1e6cde5af24028012734731681 (patch) | |
| tree | 11e0e93507ee6e281d648571e7e9e5599594bf04 /src | |
| parent | 84de824a3b0d11eb628313bd9220a12a5412b505 (diff) | |
fix for functions in mathops
Diffstat (limited to 'src')
| -rw-r--r-- | src/jsifier.js | 2 | ||||
| -rw-r--r-- | src/library.js | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/jsifier.js b/src/jsifier.js index b5ac1262..aadc021c 100644 --- a/src/jsifier.js +++ b/src/jsifier.js @@ -699,7 +699,7 @@ function JSify(data, functionsOnly, givenTypes, givenFunctions) { makeFuncLineZyme('mathop', function(item) { with(item) { for (var i = 1; i <= 4; i++) { if (item['param'+i]) { - item['ident'+i] = finalizeLLVMParameter(item['param'+i]); + item['ident'+i] = indexizeFunctions(finalizeLLVMParameter(item['param'+i])); } } if (GUARD_SIGNS) { diff --git a/src/library.js b/src/library.js index 5ebd2c02..b4efd901 100644 --- a/src/library.js +++ b/src/library.js @@ -215,6 +215,9 @@ var Library = { var i = 0; do { IHEAP[pdest+len+i] = IHEAP[psrc+i]; +#if SAFE_HEAP + SAFE_HEAP_ACCESS(pdest+len+i, 'i8', true); +#endif i ++; } while (IHEAP[psrc+i-1] != 0); return pdest; @@ -224,7 +227,11 @@ var Library = { var len = Pointer_stringify(pdest).length; // TODO: use strlen, but need dependencies system var i = 0; while(1) { - if ((IHEAP[pdest+len+i] = IHEAP[psrc+i]) == 0) break; + IHEAP[pdest+len+i] = IHEAP[psrc+i]; +#if SAFE_HEAP + SAFE_HEAP_ACCESS(pdest+len+i, 'i8', true); +#endif + if (IHEAP[pdest+len+i] == 0) break; i ++; if (i == num) { IHEAP[pdest+len+i] = 0; |