JavaByteCodeProcessorAdapter.st
branchdevelopment
changeset 2699 f428d02d9d2e
parent 2698 c243b2455f71
child 2711 a00302fe5083
--- a/JavaByteCodeProcessorAdapter.st	Fri Aug 30 17:28:45 2013 +0100
+++ b/JavaByteCodeProcessorAdapter.st	Sat Aug 31 12:59:14 2013 +0100
@@ -101,11 +101,15 @@
 !
 
 aload
-
-    
-    self fetchByte.
+    wide ifTrue:[
+        wide := false.
+        self fetchIndex2.
+    ] ifFalse:[
+        self fetchIndex.
+    ]
 
     "Modified (comment): / 09-02-2012 / 21:12:38 / mh <hlopik@gmail.com>"
+    "Modified: / 31-08-2013 / 12:54:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 aload: idx
@@ -135,9 +139,15 @@
 !
 
 astore
-   self fetchByte.
+    wide ifTrue:[
+        wide := false.
+        self istore: self fetchIndex2.
+    ] ifFalse:[
+        self istore: self fetchIndex.
+    ]
 
     "Modified: / 09-02-2012 / 21:13:42 / mh <hlopik@gmail.com>"
+    "Modified: / 31-08-2013 / 12:57:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 astore: idx
@@ -245,9 +255,15 @@
 !
 
 dload
- self fetchByte.
+    wide ifTrue:[
+        wide := false.
+        self dload: self fetchIndex2.
+    ] ifFalse:[
+        self dload: self fetchIndex.
+    ]
 
     "Modified: / 09-02-2012 / 21:17:47 / mh <hlopik@gmail.com>"
+    "Modified: / 31-08-2013 / 12:55:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 dload: idx
@@ -279,10 +295,16 @@
 !
 
 dstore
-    self fetchIndex
+    wide ifTrue:[
+        wide := false.
+        self dstore: self fetchIndex2.
+    ] ifFalse:[
+        self dstore: self fetchIndex.
+    ]
 
     "Created: / 14-03-2011 / 18:04:05 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
     "Modified: / 09-02-2012 / 21:21:05 / mh <hlopik@gmail.com>"
+    "Modified: / 31-08-2013 / 12:57:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 dstore: idx
@@ -380,9 +402,15 @@
 !
 
 fload
-    self fetchIndex.
+    wide ifTrue:[
+        wide := false.
+        self fload: self fetchIndex2.
+    ] ifFalse:[
+        self fload: self fetchIndex.
+    ]
 
     "Modified: / 09-02-2012 / 21:25:01 / mh <hlopik@gmail.com>"
+    "Modified: / 31-08-2013 / 12:55:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 fload: idx
@@ -412,10 +440,16 @@
 !
 
 fstore
-     self fetchIndex.
+    wide ifTrue:[
+        wide := false.
+        self fstore: self fetchIndex2.
+    ] ifFalse:[
+        self fstore: self fetchIndex.
+    ]
 
     "Created: / 14-03-2011 / 18:01:34 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
     "Modified: / 09-02-2012 / 21:23:14 / mh <hlopik@gmail.com>"
+    "Modified: / 31-08-2013 / 12:56:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 fstore: idx
@@ -637,17 +671,30 @@
 !
 
 iinc
-
-                    self fetchBytes2.
+    wide ifTrue:[
+        wide := false.
+        self fetchIndex2.
+        self fetchBytes2.
+    ] ifFalse:[
+        self fetchIndex.
+        self fetchByte
+    ]
 
     "Created: / 14-03-2011 / 17:22:22 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
     "Modified: / 09-02-2012 / 21:30:13 / mh <hlopik@gmail.com>"
+    "Modified: / 31-08-2013 / 12:53:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 iload
-   self fetchIndex.
+    wide ifTrue:[
+        wide := false.
+        self iload: self fetchIndex2.
+    ] ifFalse:[
+        self iload: self fetchIndex.
+    ]
 
     "Modified: / 09-02-2012 / 21:30:25 / mh <hlopik@gmail.com>"
+    "Modified: / 31-08-2013 / 12:55:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 iload: idx
@@ -752,9 +799,15 @@
 !
 
 istore
- self fetchIndex.
+    wide ifTrue:[
+        wide := false.
+        self istore: self fetchIndex2.
+    ] ifFalse:[
+        self istore: self fetchIndex.
+    ]
 
     "Modified: / 09-02-2012 / 21:33:33 / mh <hlopik@gmail.com>"
+    "Modified: / 31-08-2013 / 12:56:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 istore: idx
@@ -869,9 +922,15 @@
 !
 
 lload
-    self fetchIndex.
+    wide ifTrue:[
+        wide := false.
+        self lload: self fetchIndex2.
+    ] ifFalse:[
+        self lload: self fetchIndex.
+    ]
 
     "Modified: / 09-02-2012 / 21:39:26 / mh <hlopik@gmail.com>"
+    "Modified: / 31-08-2013 / 12:55:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 lload: idx
@@ -932,9 +991,15 @@
 !
 
 lstore
-   self fetchIndex.
+    wide ifTrue:[
+        wide := false.
+        self lstore: self fetchIndex2.
+    ] ifFalse:[
+        self lstore: self fetchIndex.
+    ]
 
     "Modified: / 09-02-2012 / 21:44:23 / mh <hlopik@gmail.com>"
+    "Modified: / 31-08-2013 / 12:57:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 lstore: idx
@@ -1027,9 +1092,15 @@
 !
 
 ret
-   self fetchByte.
+    wide ifTrue:[
+        wide := false.
+        self fetchIndex2.
+    ] ifFalse:[
+        self fetchIndex.
+    ]
 
     "Modified: / 09-02-2012 / 21:47:06 / mh <hlopik@gmail.com>"
+    "Modified: / 31-08-2013 / 12:57:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 ret_w
@@ -1082,11 +1153,14 @@
 !
 
 wide
-   |nextOp|
-   nextOp := self fetchByte.
-   nextOp = 16r84 ifTrue: [self fetchBytes4] ifFalse: [self fetchBytes2].
+    wide := true.
+"/   |nextOp|
+"/   nextOp := self fetchByte.
+"/   nextOp = 16r84 ifTrue: [self fetchBytes4] ifFalse: [self fetchBytes2].
+"/
 
     "Modified: / 09-02-2012 / 22:23:56 / mh <hlopik@gmail.com>"
+    "Modified: / 31-08-2013 / 12:38:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaByteCodeProcessorAdapter methodsFor:'processing'!