@@ -3,3 +3,4 @@ Change log started July 2009.
July 2009
================================================================================
+ Set the Z Machine Spec version header
+ + The optimised storew opcode would not correctly account for negative addresses.
CHANGES
@@ -602,38 +602,38 @@ function handleZ_call_vs(engine, a) {
}
////////////////////////////////////////////////////////////////
-
+/***
function handleZ_store_w(engine, a) {
return "setWord("+a[2]+",1*"+a[0]+"+2*"+a[1]+")";
}
+***/
-/***
// Store a value in an array
function handleZ_store_w(engine, a)
{
// Calculate the address
if (isNotConst.test(a[0]) || isNotConst.test(a[1]))
- var code = 'var tmp_' + (++temp_var) + ' = ' + a[0] + ' + 2 * ' + a[1] + ';', add = 'tmp_' + temp_var;
+ var code = 'var tmp_' + (++temp_var) + ' = (' + a[0] + ' + 2 * ' + a[1] + ') & 0xFFFF;', addr = 'tmp_' + temp_var;
else
- var code = '', add = a[0] + 2 * a[1];
+ var code = '', addr = (a[0] + 2 * a[1]) & 0xFFFF;
// If we are setting a constant get the high and low bytes at compile time
if (!isNotConst.test(a[2]))
{
var value = (a[2] & 0x8000 ? ~0xFFFF : 0) | a[2];
- return code + 'm_memory[' + add + '] = ' + ((value >> 8) & 0xFF) + ';' +
- 'm_memory[' + add + ' + 1] = ' + (value & 0xFF);
+ return code + 'm_memory[' + addr + '] = ' + ((value >> 8) & 0xFF) + ';' +
+ 'm_memory[' + addr + ' + 1] = ' + (value & 0xFF);
}
else
{
var tmp = 'tmp_' + (++temp_var);
return code + 'var ' + tmp + ' = ' + a[2] + ';' +
tmp + ' = (' + tmp + ' & 0x8000 ? ~0xFFFF : 0) | ' + tmp + ';' +
- 'm_memory[' + add + '] = (' + tmp + ' >> 8) & 0xFF;' +
- 'm_memory[' + add + ' + 1] = ' + tmp + ' & 0xFF;';
+ 'm_memory[' + addr + '] = (' + tmp + ' >> 8) & 0xFF;' +
+ 'm_memory[' + addr + ' + 1] = ' + tmp + ' & 0xFF;';
}
}
-***/
+
function handleZ_storeb(engine, a) {
return "setByte("+a[2]+",1*"+a[0]+"+1*"+a[1]+")";
}
gnusto-engine.js
@@ -8,12 +8,13 @@
<script src="testrunner.js"></script>
<script src="../gnusto-engine.js"></script>
<script>
+FatalError = new Error();
$(document).ready(function(){
test("Opcode storew", function() {
var arrays = {"test_array": 64};
var zcode = [5,0,0,1,0,0,0,81,0,0,0,64,0,64,0,0,0,0,48,57,48,55,50,55,0,64,0,41,0,0,0,0,0,0,0,0,0,0,0,0,0,80,0,80,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73,78,70,65,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,225,83,64,0,12,34,232,63,12,34,225,91,64,1,0,232,127,2,225,99,64,0,12,34,232,63,12,34,232,127,3,225,107,64,0,0,232,127,64,225,147,0,4,12,34,232,63,12,34,232,127,64,225,155,0,5,0,232,127,6,232,127,64,225,163,0,0,12,34,232,63,12,34,232,127,7,232,127,64,225,171,0,0,0,186];
- var engine = new GnustoEngine(console.log);
+ var engine = new GnustoEngine();
engine.loadStory(zcode);
engine.run();
same(engine.m_memory.slice(arrays.test_array, arrays.test_array + 16), [12,34,12,34,12,34,12,34,12,34,12,34,12,34,12,34]);
tests/opcodes.html
@@ -16,6 +16,7 @@ template = '''<!DOCTYPE HTML>
<script src="testrunner.js"></script>
<script src="../gnusto-engine.js"></script>
<script>
+FatalError = new Error();
$(document).ready(function(){'''
template_after = '''\n\n});
</script>
@@ -53,7 +54,7 @@ for test in tests:
# Output the Gnusto running code
output.write('''
- var engine = new GnustoEngine(console.log);
+ var engine = new GnustoEngine();
engine.loadStory(zcode);
engine.run();''')
tests/opcodes.py
@@ -2,6 +2,9 @@
! VAR:225 1 storew array word-index value
! array-->word-index = value, i.e. stores the given value in the word at address array+2*word-index (which must lie in dynamic memory). (See loadw.)
+! Gnusto used to fail to correctly set addresses to unsigned values, and this array would show that. But it makes the test page too big so it's commented out now.
+!Array aaa --> 17000;
+
Array test_array --> 8;
Constant VALUE $C22;
tests/opcodes/225.inf
8a9122bfa672385af67ef5a67e85e231f36998a2
Dannii Willis
curiousdannii@gmail.com
http://github.com/curiousdannii/gnusto/commit/c2ed96d131c7c982b2064a5288fccdcc397d2bd0
c2ed96d131c7c982b2064a5288fccdcc397d2bd0
2009-07-26T19:54:32-07:00
2009-07-26T19:54:32-07:00
+ The optimised storew opcode would not correctly account for negative addresses.
11dc70c15af516f35cd683789740e918aa11aa2e
Dannii Willis
curiousdannii@gmail.com