diff --git a/src/intrp.def b/src/intrp.def index 41beccc..2882ff3 100644 --- a/src/intrp.def +++ b/src/intrp.def @@ -532,12 +532,11 @@ DEFOP(GETSTATIC) var indexbyte1 = READ_NEXT(); var indexbyte2 = READ_NEXT(); - CHECK_NULL(objectref) var field = xl.constantPool.get((indexbyte1 << 8) | indexbyte2); var aClass = field.class_ref.name_ref.str; //check if static - OPPUSH(jvm.classForName(aClass)[canonicalName(field.class_ref.name_ref) + " " + field.name_and_type_ref.name_ref.str]); + OPPUSH(xl.jvm.classForName(aClass)[canonicalName(field.class_ref.name_ref) + " " + field.name_and_type_ref.name_ref.str]); ENDDEF DEFOP(GOTO) @@ -1446,7 +1445,7 @@ DEFOP(PUTFIELD) objectref[field.class_ref.name_ref.str + " " + field.name_and_type_ref.name_ref.str] = value; ENDDEF -DEFOP(GETSTATIC) +DEFOP(PUTSTATIC) var indexbyte1 = READ_NEXT(); var indexbyte2 = READ_NEXT(); var value = OPPOP(); diff --git a/webserver/app.py b/webserver/app.py index 60a14a9..c6eeb41 100644 --- a/webserver/app.py +++ b/webserver/app.py @@ -30,7 +30,7 @@ class index: return commands.getstatusoutput("cat ../src/*.js | cpp -DDEBUG -DDEBUG_INTRP -I../src/ -P -undef -CC -Wundef -std=c99 -nostdinc -Wtrigraphs -fdollars-in-identifiers")[1] if "testRuntime" in filename: alphex = filename[filename.rfind("/") + 1:]; - return file("../runtime/" + alphex.replace(".","/") + ".class"); + return file("../runtime/" + alphex.replace(".","/") + ".class").read(); if filename == "": return file("index.html").read() try: