Flag bits fixed jk_new_structure
authorvranyj1
Tue, 25 Oct 2011 16:11:16 +0000
branchjk_new_structure
changeset 1050 df4edfc9b41f
parent 1049 d873d4e99ef6
child 1051 52d5279dd3dc
Flag bits fixed
src/JavaClassReader.st
src/JavaMethod.st
--- a/src/JavaClassReader.st	Tue Oct 25 08:50:18 2011 +0000
+++ b/src/JavaClassReader.st	Tue Oct 25 16:11:16 2011 +0000
@@ -2125,6 +2125,9 @@
             m code:nil.
             m byteCode:nil.
         ].
+
+        self assert: (m numArgs == m numberOfJavaArgs).
+
         (m exceptionHandlerTable isNil) ifTrue:[
             m isNative ifFalse:[
                 m getExceptionTable isNil ifTrue:[
@@ -2153,7 +2156,7 @@
 
     "Created: / 15-04-1996 / 16:48:49 / cg"
     "Modified: / 25-09-1999 / 23:16:25 / cg"
-    "Modified: / 14-09-2011 / 22:08:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 25-10-2011 / 17:41:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 readMethodsFor:aJavaClass
--- a/src/JavaMethod.st	Tue Oct 25 08:50:18 2011 +0000
+++ b/src/JavaMethod.st	Tue Oct 25 16:11:16 2011 +0000
@@ -126,9 +126,9 @@
     A_STRICT       := 16r0800.
     A_SYNTHETIC    := 16r1000.
 
-    R_VOID         := 16r100000.
-    R_LONG         := 16r200000.
-    R_DOUBLE       := 16r300000.
+    R_VOID         := 16r1000000.
+    R_LONG         := 16r2000000.
+    R_DOUBLE       := 16r3000000.
 
     A_BREAKPOINT   := 16r0800000.
     A_HASHANDLER   := 16r1000000.
@@ -158,7 +158,7 @@
     "
 
     "Modified: / 16-10-1998 / 01:29:48 / cg"
-    "Modified: / 13-08-2011 / 01:02:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 25-10-2011 / 18:13:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 reinitialize
@@ -1162,7 +1162,11 @@
 
 numberOfJavaArgs
 
-    ^(accessFlags bitAnd: 16r00FF0000) rightShift: 16.
+    ^((accessFlags ? 0) bitAnd: 16r00FF0000) rightShift: 16.
+
+    "
+    JavaMethod basicNew numberOfJavaArgs: 0; numberOfJavaArgs
+    "
 
     "Created: / 25-10-2011 / 10:45:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
@@ -1173,7 +1177,7 @@
         ArgumentError raiseRequestWith:self errorString:'too many args method  - ', nArgs printString.
     ].
 
-    accessFlags := accessFlags bitOr: 
+    accessFlags := (accessFlags ? 0) bitOr: 
         ((nArgs bitAnd: 16rFF) bitShift: 16)
 
     "Created: / 25-10-2011 / 10:43:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"