aaron/c0db
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

This whole "strings" thing isn't quite working...

Browse Source
This commit is contained in:
Mitchell Plamann
2015-04-12 00:56:07 -04:00
parent ee99956b52
commit 65197535bc
3 changed files with 55 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/c0vm.js
View File

@@ -394,10 +394,16 @@ ProgramState.prototype.step = function() {
// Read offset into an array
var elt_index = this.pop();
var index = this.pop();
var array_length = this.heap[index];
var elt_size = this.heap[index+1];
if (elt_index >= array_length) c0_memory_error("Array index out of bounds.");
this.push(index + 2 + (elt_size*elt_index));
if (typeof index == "string") {
this.push(index.slice(elt_index));
} else {
var array_length = this.heap[index];
var elt_size = this.heap[index+1];
if (elt_index >= array_length)
c0_memory_error("Array index out of bounds.");
this.push(index + 2 + (elt_size*elt_index));
}
this.frame.pc++;
break;
@@ -438,7 +444,10 @@ ProgramState.prototype.step = function() {
case op.CMLOAD:
var addr = this.pop();
this.push(this.heap[addr]);
if (typeof addr == "string")
this.push(addr);
else
this.push(this.heap[addr]);
this.frame.pc++;
break;