Mirrors/webamp
1
0
Fork 0
mirror of https://github.com/captbaritone/webamp.git synced 2026-07-22 17:47:16 +00:00
Code Issues Projects Releases Wiki Activity

fix variable unboxing issue, move all unboxing to single method (#827)

Browse source
This commit is contained in:
jberg 2019-08-02 22:56:51 -07:00 • committed by Jordan Eldredge
parent 0335e4129f
commit 8ee3882aba
1 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

33
experiments/modern/src/maki-interpreter/virtualMachine.js
View file

@ -22,6 +22,11 @@ function coerceTypes(var1, var2, val1, val2) {
function* interpret(start, program, stack = []) {
const { commands, methods, variables, classes } = program;
function popStackValue() {
const v = stack.pop();
return v instanceof Variable ? v.getValue() : v;
}
function twoArgCoercingOperator(operator) {
const a = stack.pop();
const b = stack.pop();
@ -33,10 +38,8 @@ function* interpret(start, program, stack = []) {
}
function twoArgOperator(operator) {
const a = stack.pop();
const b = stack.pop();
const aValue = a instanceof Variable ? a.getValue() : a;
const bValue = b instanceof Variable ? b.getValue() : b;
const aValue = popStackValue();
const bValue = popStackValue();
stack.push(operator(bValue, aValue));
}
@ -65,8 +68,7 @@ function* interpret(start, program, stack = []) {
}
// popTo
case 3: {
const a = stack.pop();
let aValue = a instanceof Variable ? a.getValue() : a;
const aValue = popStackValue();
const offsetIntoVariables = command.arg;
const toVar = variables[offsetIntoVariables];
toVar.setValue(aValue);
@ -104,7 +106,7 @@ function* interpret(start, program, stack = []) {
}
// jumpIf
case 16: {
const value = stack.pop();
const value = popStackValue();
// This seems backwards. Seems like we're doing a "jump if not"
if (value) {
break;
@ -114,7 +116,7 @@ function* interpret(start, program, stack = []) {
}
// jumpIfNot
case 17: {
const value = stack.pop();
const value = popStackValue();
// This seems backwards. Same as above
if (!value) {
break;
@ -148,12 +150,10 @@ function* interpret(start, program, stack = []) {
const methodArgs = [];
while (argCount--) {
const a = stack.pop();
const aValue = a instanceof Variable ? a.getValue() : a;
const aValue = popStackValue();
methodArgs.push(aValue);
}
const variable = stack.pop();
const obj = variable instanceof Variable ? variable.getValue() : variable;
const obj = popStackValue();
stack.push(obj[methodName](...methodArgs));
break;
}
@ -169,8 +169,7 @@ function* interpret(start, program, stack = []) {
}
// return
case 33: {
const a = stack.pop();
const aValue = a instanceof Variable ? a.getValue() : a;
const aValue = popStackValue();
return aValue;
}
// mov
@ -262,15 +261,13 @@ function* interpret(start, program, stack = []) {
}
// ! (not)
case 74: {
const a = stack.pop();
const aValue = a instanceof Variable ? a.getValue() : a;
const aValue = popStackValue();
stack.push(aValue ? 0 : 1);
break;
}
// - (negative)
case 76: {
const a = stack.pop();
const aValue = a instanceof Variable ? a.getValue() : a;
const aValue = popStackValue();
stack.push(-aValue);
break;
}