--- a/Java.st Tue Nov 10 14:29:36 1998 +0000
+++ b/Java.st Tue Nov 10 14:33:35 1998 +0000
@@ -209,7 +209,6 @@
system := self classForName:'java.lang.System'.
system isInitialized ifFalse:[
- system classInit.
self initSystemClass.
].
@@ -219,7 +218,7 @@
]
]
- "Modified: / 27.4.1998 / 14:58:02 / cg"
+ "Modified: / 10.11.1998 / 12:39:52 / cg"
!
initAllStaticFields
@@ -241,6 +240,8 @@
^ self
].
].
+
+ system classInit.
(system implements:#'initializeSystemClass()V') ifTrue:[
system perform: "invokeStatic:" #'initializeSystemClass()V'.
].
@@ -253,7 +254,7 @@
with:(Java as_String:'java.home')
"
- "Modified: / 4.11.1998 / 19:50:44 / cg"
+ "Modified: / 10.11.1998 / 12:39:58 / cg"
!
initialize
@@ -1301,6 +1302,6 @@
!Java class methodsFor:'documentation'!
version
- ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/Java.st,v 1.77 1998/11/10 00:21:53 cg Exp $'
+ ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/Java.st,v 1.78 1998/11/10 14:32:49 cg Exp $'
! !
Java initialize!
--- a/JavaContext.st Tue Nov 10 14:29:36 1998 +0000
+++ b/JavaContext.st Tue Nov 10 14:33:35 1998 +0000
@@ -174,9 +174,18 @@
pc
lineNr isNil ifTrue:[^ nil].
- ^ super lineNumber
+ ^ lineNr bitAnd:16rFFFF
"Created: / 4.1.1998 / 23:33:48 / cg"
+ "Modified: / 10.11.1998 / 13:20:12 / cg"
+!
+
+quickLineNumber
+ "the lineNumber - without decompiling"
+
+ ^ self method quickLineNumberForPC:self pc
+
+ "Created: / 10.11.1998 / 14:20:30 / cg"
!
selector
@@ -351,5 +360,5 @@
!JavaContext class methodsFor:'documentation'!
version
- ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaContext.st,v 1.26 1998/11/10 00:23:19 cg Exp $'
+ ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaContext.st,v 1.27 1998/11/10 14:31:57 cg Exp $'
! !
--- a/JavaDecompiler.st Tue Nov 10 14:29:36 1998 +0000
+++ b/JavaDecompiler.st Tue Nov 10 14:33:35 1998 +0000
@@ -392,7 +392,7 @@
and:[if package ~= pckgName]) ifTrue:[
s nextPutAll:(if displayString)
] ifFalse:[
- s nextPutAll:(if name)
+ s nextPutAll:(if lastName)
].
s emphasis:codeStyle.
].
@@ -519,7 +519,7 @@
s nextPutAll:'}'; cr.
"Created: / 22.3.1997 / 14:29:37 / cg"
- "Modified: / 5.11.1998 / 19:46:41 / cg"
+ "Modified: / 10.11.1998 / 12:25:56 / cg"
!
methodDefinitionOf:aMethod inPackage:pckgName on:s
@@ -955,6 +955,6 @@
!JavaDecompiler class methodsFor:'documentation'!
version
- ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaDecompiler.st,v 1.35 1998/11/05 19:14:51 cg Exp $'
+ ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaDecompiler.st,v 1.36 1998/11/10 14:31:50 cg Exp $'
! !
JavaDecompiler initialize!
--- a/JavaEmbeddedFrameView.st Tue Nov 10 14:29:36 1998 +0000
+++ b/JavaEmbeddedFrameView.st Tue Nov 10 14:33:35 1998 +0000
@@ -582,8 +582,7 @@
].
embeddedAppletFrame instVarNamed:'pData' put:self.
- toolkit := Java classForName:'java.awt.Toolkit'.
- toolkit := toolkit perform:#getDefaultToolkit.
+ toolkit := (Java classForName:'java.awt.Toolkit') perform:#'getDefaultToolkit'.
peer := toolkit
perform:#'createFrame(Ljava/awt/Frame;)Ljava/awt/peer/FramePeer;'
with:embeddedAppletFrame.
@@ -634,7 +633,7 @@
^ true
"Created: / 20.10.1998 / 15:47:04 / cg"
- "Modified: / 5.11.1998 / 08:45:34 / cg"
+ "Modified: / 10.11.1998 / 12:36:09 / cg"
! !
!JavaEmbeddedFrameView methodsFor:'resizing'!
@@ -662,5 +661,5 @@
!JavaEmbeddedFrameView class methodsFor:'documentation'!
version
- ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaEmbeddedFrameView.st,v 1.12 1998/11/05 10:34:59 cg Exp $'
+ ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaEmbeddedFrameView.st,v 1.13 1998/11/10 14:33:35 cg Exp $'
! !
--- a/JavaFieldref.st Tue Nov 10 14:29:36 1998 +0000
+++ b/JavaFieldref.st Tue Nov 10 14:33:35 1998 +0000
@@ -41,12 +41,12 @@
class isNil ifTrue:[
^ 'JavaFieldRef ( ** unknown class ** ''' , nameandType displayString , ''')'
].
- ^ 'JavaFieldRef (' , class fullName , ' '
+ ^ 'JavaFieldRef (' , class displayString "fullName" , ' '
, '''' , nameandType name , '''' , nameandType signature
, ' offs=' , offset printString
, ')'
- "Modified: / 5.11.1998 / 16:29:51 / cg"
+ "Modified: / 10.11.1998 / 12:23:54 / cg"
! !
!JavaFieldref methodsFor:'resolving'!
@@ -157,6 +157,6 @@
!JavaFieldref class methodsFor:'documentation'!
version
- ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaFieldref.st,v 1.20 1998/11/10 00:23:01 cg Exp $'
+ ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaFieldref.st,v 1.21 1998/11/10 14:31:40 cg Exp $'
! !
JavaFieldref initialize!
--- a/JavaVM.st Tue Nov 10 14:29:36 1998 +0000
+++ b/JavaVM.st Tue Nov 10 14:33:35 1998 +0000
@@ -734,6 +734,16 @@
Java initAllStaticFields.
Java markAllClassesUninitialized.
+ "/ force re-resolving;
+ "/ otherwise, class-inits would not be called
+ "/ by resolver ... (sigh)
+
+ JavaMethod allSubInstancesDo:[:m |
+ m checked:false.
+ m code:nil.
+ ].
+ ObjectMemory flushCaches. "/ sigh - must flush inline caches.
+
self initializeSimulatedLibs. "/ < jdk 1.2
self initializeSimulatedNativeLibs. "/ >= jdk 1.2
self initializeOpenFileTable.
@@ -741,7 +751,6 @@
self initializeBaseClasses.
self initializePrimitiveClasses.
- (Java classForName:'java.lang.System') classInit.
Java initSystemClass.
ObjectMemory addDependent:self.
@@ -752,7 +761,7 @@
"
"Created: / 3.1.1998 / 21:29:09 / cg"
- "Modified: / 4.2.1998 / 23:08:06 / cg"
+ "Modified: / 10.11.1998 / 12:43:51 / cg"
!
initializeVMIfNoEventThreadRunning
@@ -1520,11 +1529,11 @@
throwClassNotFoundException:className
self
- throwExceptionClassName:'java.lang.ClassNotFoundException'
- withMessage:'no such class: ' , className
+ throwExceptionClassName:'java.lang.ClassNotFoundException'
+ withMessage:'no such class: ' , className
"Created: / 4.1.1998 / 22:26:09 / cg"
- "Modified: / 7.1.1998 / 15:25:58 / cg"
+ "Modified: / 10.11.1998 / 13:20:31 / cg"
!
throwException:aJavaException
@@ -4271,22 +4280,22 @@
out nextPutLine:'JAVA: stackTrace:'.
contextList do:[:con |
- out
- nextPutAll:' ';
- nextPutAll:(con method javaClass fullName);
- nextPutAll:'.';
- nextPutAll:(con method selector);
- nextPutAll:' [';
- nextPutAll:(con method javaClass sourceFile);
- nextPutAll:' ';
- nextPutAll:(con lineNumber displayString);
- nextPutAll:']'.
- out cr
+ out
+ nextPutAll:' ';
+ nextPutAll:(con method javaClass fullName);
+ nextPutAll:'.';
+ nextPutAll:(con method selector);
+ nextPutAll:' [';
+ nextPutAll:(con method javaClass sourceFile);
+ nextPutAll:' ';
+ nextPutAll:(con quickLineNumber displayString);
+ nextPutAll:']'.
+ out cr
].
out nextPutLine:'----------------------------------------------------'
"Created: / 4.1.1998 / 14:27:40 / cg"
- "Modified: / 15.1.1998 / 00:14:40 / cg"
+ "Modified: / 10.11.1998 / 14:19:32 / cg"
! !
!JavaVM class methodsFor:'native - java.lang - jdk1.2'!
@@ -8263,6 +8272,6 @@
!JavaVM class methodsFor:'documentation'!
version
- ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaVM.st,v 1.56 1998/11/10 00:21:22 cg Exp $'
+ ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaVM.st,v 1.57 1998/11/10 14:32:21 cg Exp $'
! !
JavaVM initialize!