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

Removed trailing whitespace and reorganized things

Browse Source
This commit is contained in:
Shyam Raghavan
2015-04-24 14:45:09 -04:00
parent 3aad88b19d
commit fbf975b4ec
4 changed files with 61 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/vm/Makefile
View File

@@ -1,4 +1,4 @@
FILES = c0vm.js bytecode-parser.js byte-stream.js opcodes.js c0ffi.js index.js FILES = c0vm.js bytecode-parser.js byte-stream.js opcodes.js c0ffi.js index.js
all: $(FILES) all: $(FILES)
browserify $(FILES) -o vm.js browserify $(FILES) -o vm.js

5
public/vm/c0vm.js
View File

@@ -3,7 +3,6 @@ op = require("./opcodes");
var INT_MIN = 0x80000000; var INT_MIN = 0x80000000;
var INT_MAX = 0x7FFFFFFF; var INT_MAX = 0x7FFFFFFF;
var verbose = false;
function log(message) { function log(message) {
if (verbose) console.log(message); if (verbose) console.log(message);
} }
@@ -499,7 +498,7 @@ function run_vm(vm) {
return vm; return vm;
} }
} }
var val = vm.step(); var val = vm.step();
if (val !== undefined) return val; if (val !== undefined) return val;
@@ -528,7 +527,7 @@ function execute(file, callbacks, v) {
function push(v) { function push(v) {
console.log("Pretend I pushed " + v); console.log("Pretend I pushed " + v);
} }
exports.execute = execute; exports.execute = execute;
exports.initialize_vm = initialize_vm; exports.initialize_vm = initialize_vm;

62
public/vm/index.js
View File

@@ -2,56 +2,46 @@ parser = require("./bytecode-parser");
c0vm = require("./c0vm.js"); c0vm = require("./c0vm.js");
c0ffi = require("./c0ffi.js"); c0ffi = require("./c0ffi.js");
// console.log("Reading in sample bytecode file:");
// console.log(parser.getBytes("../test/test.bc0"));
// console.log("That was the sample bytecode file" +
// " -- it probably took up your whole terminal screen.");
// var file = parser.parse("../test/test.bc0");
// console.log(file);
// console.log(file.function_pool[0].code);
// UI interaction functions // UI interaction functions
function print(arg) { function print(arg) {
// $("#output").append(arg);
$("#output").val($("#output").val() + arg); $("#output").val($("#output").val() + arg);
} }
callbacks = c0ffi.default_callbacks; callbacks = c0ffi.default_callbacks;
// conio // conio
callbacks[c0ffi.NATIVE_PRINT] = function(args) { callbacks[c0ffi.NATIVE_PRINT] = function(args) {
print(args[0]); print(args[0]);
return 0; return 0;
} }
callbacks[c0ffi.NATIVE_PRINTLN] = function(args) { callbacks[c0ffi.NATIVE_PRINTLN] = function(args) {
print(args[0]); print(args[0]);
print("\n"); print("\n");
} }
callbacks[c0ffi.NATIVE_PRINTBOOL] = function(args) { callbacks[c0ffi.NATIVE_PRINTBOOL] = function(args) {
if (args[0]) if (args[0])
print("false"); print("false");
else else
print("true"); print("true");
} }
callbacks[c0ffi.NATIVE_PRINTCHAR] = function(args) { callbacks[c0ffi.NATIVE_PRINTCHAR] = function(args) {
print(String.fromCharCode(args[0])); print(String.fromCharCode(args[0]));
} }
callbacks[c0ffi.NATIVE_READLINE] = function(args) { callbacks[c0ffi.NATIVE_READLINE] = function(args) {
return prompt("",""); return prompt("","");
} }
callbacks[c0ffi.NATIVE_PRINTINT] = function(args) { callbacks[c0ffi.NATIVE_PRINTINT] = function(args) {
print(args[0]); print(args[0]);
} }
console.log(callbacks); console.log(callbacks);
$("#run").click(function() { $("#run").click(function() {
var input = $("#bytecode").val().replace(/(\r\n|\n|\r)/gm,""); var input = $("#bytecode").val().replace(/(\r\n|\n|\r)/gm,"");
$("#output").val(""); $("#output").val("");
var file = parser.parse($("#bytecode").val()); var file = parser.parse($("#bytecode").val());
print(c0vm.execute(file, callbacks)); c0vm.execute(file, callbacks, true);
}); });

71
public/vm/vm.js
View File

@@ -319,6 +319,10 @@ callbacks[exports.NATIVE_STRING_COMPARE] = function(args) {
return 0; return 0;
} }
callbacks[exports.NATIVE_STRING_EQUAL] = function(args) {
return args[0] === args[1];
}
exports.default_callbacks = callbacks; exports.default_callbacks = callbacks;
},{}],4:[function(require,module,exports){ },{}],4:[function(require,module,exports){
@@ -327,7 +331,6 @@ op = require("./opcodes");
var INT_MIN = 0x80000000; var INT_MIN = 0x80000000;
var INT_MAX = 0x7FFFFFFF; var INT_MAX = 0x7FFFFFFF;
var verbose = false;
function log(message) { function log(message) {
if (verbose) console.log(message); if (verbose) console.log(message);
} }
@@ -823,7 +826,7 @@ function run_vm(vm) {
return vm; return vm;
} }
} }
var val = vm.step(); var val = vm.step();
if (val !== undefined) return val; if (val !== undefined) return val;
@@ -852,7 +855,7 @@ function execute(file, callbacks, v) {
function push(v) { function push(v) {
console.log("Pretend I pushed " + v); console.log("Pretend I pushed " + v);
} }
exports.execute = execute; exports.execute = execute;
exports.initialize_vm = initialize_vm; exports.initialize_vm = initialize_vm;
@@ -864,58 +867,48 @@ parser = require("./bytecode-parser");
c0vm = require("./c0vm.js"); c0vm = require("./c0vm.js");
c0ffi = require("./c0ffi.js"); c0ffi = require("./c0ffi.js");
// console.log("Reading in sample bytecode file:");
// console.log(parser.getBytes("../test/test.bc0"));
// console.log("That was the sample bytecode file" +
// " -- it probably took up your whole terminal screen.");
// var file = parser.parse("../test/test.bc0");
// console.log(file);
// console.log(file.function_pool[0].code);
// UI interaction functions // UI interaction functions
function print(arg) { function print(arg) {
// $("#output").append(arg);
$("#output").val($("#output").val() + arg); $("#output").val($("#output").val() + arg);
} }
callbacks = c0ffi.default_callbacks; callbacks = c0ffi.default_callbacks;
// conio // conio
callbacks[c0ffi.NATIVE_PRINT] = function(args) { callbacks[c0ffi.NATIVE_PRINT] = function(args) {
print(args[0]); print(args[0]);
return 0; return 0;
} }
callbacks[c0ffi.NATIVE_PRINTLN] = function(args) { callbacks[c0ffi.NATIVE_PRINTLN] = function(args) {
print(args[0]); print(args[0]);
print("\n"); print("\n");
} }
callbacks[c0ffi.NATIVE_PRINTBOOL] = function(args) { callbacks[c0ffi.NATIVE_PRINTBOOL] = function(args) {
if (args[0]) if (args[0])
print("false"); print("false");
else else
print("true"); print("true");
} }
callbacks[c0ffi.NATIVE_PRINTCHAR] = function(args) { callbacks[c0ffi.NATIVE_PRINTCHAR] = function(args) {
print(String.fromCharCode(args[0])); print(String.fromCharCode(args[0]));
} }
callbacks[c0ffi.NATIVE_READLINE] = function(args) { callbacks[c0ffi.NATIVE_READLINE] = function(args) {
return prompt("",""); return prompt("","");
} }
callbacks[c0ffi.NATIVE_PRINTINT] = function(args) { callbacks[c0ffi.NATIVE_PRINTINT] = function(args) {
print(args[0]); print(args[0]);
} }
console.log(callbacks); console.log(callbacks);
$("#run").click(function() { $("#run").click(function() {
var input = $("#bytecode").val().replace(/(\r\n|\n|\r)/gm,""); var input = $("#bytecode").val().replace(/(\r\n|\n|\r)/gm,"");
$("#output").val(""); $("#output").val("");
var file = parser.parse($("#bytecode").val()); var file = parser.parse($("#bytecode").val());
print(c0vm.execute(file, callbacks)); c0vm.execute(file, callbacks, true);
}); });
},{"./bytecode-parser":2,"./c0ffi.js":3,"./c0vm.js":4}],6:[function(require,module,exports){ },{"./bytecode-parser":2,"./c0ffi.js":3,"./c0vm.js":4}],6:[function(require,module,exports){