poor attempt to implement mcompile on javaMethod jk_new_structure
authorhlopkmar
Fri, 24 Feb 2012 13:00:55 +0000
branchjk_new_structure
changeset 1381 145a1ff31ee8
parent 1380 3c63e1f49a14
child 1382 42f95d2b8de1
poor attempt to implement mcompile on javaMethod
src/JavaMethod.st
src/JavaVM.st
src/Make.proto
src/Make.spec
src/bc.mak
src/libjava.rc
--- a/src/JavaMethod.st	Thu Feb 23 16:52:46 2012 +0000
+++ b/src/JavaMethod.st	Fri Feb 24 13:00:55 2012 +0000
@@ -1299,6 +1299,28 @@
 
 !JavaMethod methodsFor:'compiler interface'!
 
+mcompile
+    "__mcompile(OBJ aMethod, unsigned char *bytecode, int nBytes, int nArgs, OBJ receiver, OBJ selector, OBJ srchClass, OBJ *pArgsOrNull)"
+    
+    | bytecode  nBytes  nArgs  receiver  mySelector  srchClass  pArgsOrNull  retVal |
+    bytecode := self byteCode.
+    nBytes := self byteCode size.
+    nArgs := self numArgs.
+    receiver := nil.
+    mySelector := self selector.
+    srchClass := self mclass.
+    
+%{
+retVal = __mcompile(self, __ByteArrayInstPtr(bytecode), __intVal(nBytes), __intVal(nArgs), receiver, mySelector, srchClass, pArgsOrNull);
+
+
+%}.
+self halt.
+
+    "Created: / 24-02-2012 / 11:39:13 / m"
+    "Modified: / 24-02-2012 / 14:00:04 / Marcel Hlopko <hlopik@gmail.com>"
+!
+
 programmingLanguage
     "Returns a programming language of the method"
 
--- a/src/JavaVM.st	Thu Feb 23 16:52:46 2012 +0000
+++ b/src/JavaVM.st	Fri Feb 24 13:00:55 2012 +0000
@@ -1854,11 +1854,10 @@
 !
 
 initializeVM
-
     "/Native code optimization is broken (for now), force-disable it"
-    ObjectMemory javaNativeCodeOptimization:false.
-
-    "Java requires a huge stack. Change default to 4 MB."
+    
+    ObjectMemory javaNativeCodeOptimization: true.
+     "Java requires a huge stack. Change default to 4 MB."
     Process defaultMaximumStackSize: 1024 * 1024 * 4.
     ClassRegistry := JavaClassRegistry for: self.
     ClassLoaderQuerySignal := Query new.
@@ -1921,6 +1920,7 @@
     "Modified: / 15-10-2010 / 15:27:45 / Jan Kurs <kurs.jan@post.cz>"
     "Modified: / 09-12-2011 / 12:22:34 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
     "Modified (format): / 18-02-2012 / 14:18:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 24-02-2012 / 13:59:29 / Marcel Hlopko <hlopik@gmail.com>"
 !
 
 initializeVMIfNoEventThreadRunning
--- a/src/Make.proto	Thu Feb 23 16:52:46 2012 +0000
+++ b/src/Make.proto	Fri Feb 24 13:00:55 2012 +0000
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava at 2012-02-23 17:51:32.800.
+# automagically generated from the projectDefinition: stx_libjava at 2012-02-24 14:00:39.219.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
--- a/src/Make.spec	Thu Feb 23 16:52:46 2012 +0000
+++ b/src/Make.spec	Fri Feb 24 13:00:55 2012 +0000
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava at 2012-02-23 17:51:31.669.
+# automagically generated from the projectDefinition: stx_libjava at 2012-02-24 14:00:38.591.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
--- a/src/bc.mak	Thu Feb 23 16:52:46 2012 +0000
+++ b/src/bc.mak	Fri Feb 24 13:00:55 2012 +0000
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libjava at 2012-02-23 17:51:33.538.
+# automagically generated from the projectDefinition: stx_libjava at 2012-02-24 14:00:39.649.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
--- a/src/libjava.rc	Thu Feb 23 16:52:46 2012 +0000
+++ b/src/libjava.rc	Fri Feb 24 13:00:55 2012 +0000
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libjava.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,1725,1725
+  FILEVERSION     6,2,1734,1734
   PRODUCTVERSION  6,2,1,1
 #if (__BORLANDC__)
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@
     BEGIN
       VALUE "CompanyName", "eXept Software AG\0"
       VALUE "FileDescription", "Smalltalk/X Class library (LIB)\0"
-      VALUE "FileVersion", "6.2.1725.1725\0"
+      VALUE "FileVersion", "6.2.1734.1734\0"
       VALUE "InternalName", "stx:libjava\0"
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\nCopyright Jan Vrany, Jan Kurs and Marcel Hlopko\b          SWING Research Group, Czech Technical University In Prague\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.1.1\0"
-      VALUE "ProductDate", "Thu, 23 Feb 2012 16:51:37 GMT\0"
+      VALUE "ProductDate", "Fri, 24 Feb 2012 13:00:43 GMT\0"
     END
 
   END