harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arc...@apache.org
Subject svn commit: r367099 - in /incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc: interp.c resolve2.c
Date Sun, 08 Jan 2006 21:14:04 GMT
Author: archie
Date: Sun Jan  8 13:14:01 2006
New Revision: 367099

URL: http://svn.apache.org/viewcvs?rev=367099&view=rev
Log:
Implement aconst_null directly. This was meant to be part of r366407.

Modified:
    incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/interp.c
    incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/resolve2.c

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/interp.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/interp.c?rev=367099&r1=367098&r2=367099&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/interp.c (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/interp.c Sun Jan
 8 13:14:01 2006
@@ -140,6 +140,7 @@
 	static const _jc_word actions[0x100] = {
 		ACTION(aaload),
 		ACTION(aastore),
+		ACTION(aconst_null),
 		ACTION(aload),
 		ACTION(aload_0),
 		ACTION(aload_1),
@@ -493,6 +494,9 @@
 	array->elems[~index] = obj;
 	NEXT();
     }
+TARGET(aconst_null)
+	PUSHL(NULL);
+	NEXT();
 TARGET(aload)
 	PUSHL(LOCALL(INFO(local)));
 	NEXT();

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/resolve2.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/resolve2.c?rev=367099&r1=367098&r2=367099&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/resolve2.c (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/resolve2.c Sun Jan
 8 13:14:01 2006
@@ -568,10 +568,6 @@
 
 		/* Copy and resolve additional info, possibly changing opcode */
 		switch (opcode) {
-		case _JC_aconst_null:
-			info->constant.l = NULL;
-			opcode = _JC_ldc;
-			break;
 		case _JC_aload:
 		case _JC_astore:
 		case _JC_dload:



Mime
View raw message