Small Windows fixes to get into VM.boot

codehaus · Apr 8, 2009 · 9d29b83 · 9d29b83
1 parent 8a8f585
commit 9d29b83
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tools/bootloader/rvm.bat b/tools/bootloader/rvm.bat
@@ -14,7 +14,7 @@ set RVM_HOME=%~dp0
 
 set BASE_ARGS=-X:ic=%RVM_HOME%\RVM.code.image -X:id=%RVM_HOME%\RVM.data.image -X:ir=%RVM_HOME%\RVM.rmap.image -X:vmClasses=%RVM_HOME%\jksvm.jar;%RVM_HOME%\rvmrt.jar;%RVM_HOME%\lib\luni.jar;%RVM_HOME%\lib\nio.jar;%RVM_HOME%\lib\nio_char.jar;%RVM_HOME%\lib\archive.jar;%RVM_HOME%\lib\concurrent.jar;%RVM_HOME%\lib\math.jar;%RVM_HOME%\lib\regex.jar;%RVM_HOME%\lib\icu4j-charsets-3_8.jar;%RVM_HOME%\lib\icu4j-3_8.jar;%RVM_HOME%\lib\yoko-rmi-impl.jar;%RVM_HOME%\lib\instrument.jar;%RVM_HOME%\lib\beans.jar;%RVM_HOME%\lib\xml-apis.jar;%RVM_HOME%\lib\mx4j.jar;%RVM_HOME%\lib\xalan.jar;%RVM_HOME%\lib\resolver.jar;%RVM_HOME%\lib\logging.jar;%RVM_HOME%\lib\bcprov.jar;%RVM_HOME%\lib\security.jar;%RVM_HOME%\lib\sql.jar;%RVM_HOME%\lib\print.jar;%RVM_HOME%\lib\mx4j-remote.jar;%RVM_HOME%\lib\luni-kernel-stubs.jar;%RVM_HOME%\lib\misc.jar;%RVM_HOME%\lib\accessibility.jar;%RVM_HOME%\lib\crypto.jar;%RVM_HOME%\lib\yoko.jar;%RVM_HOME%\lib\rmi.jar;%RVM_HOME%\lib\security-kernel-stubs.jar;%RVM_HOME%\lib\x-net.jar;%RVM_HOME%\lib\imageio.jar;%RVM_HOME%\lib\lang-management.jar;%RVM_HOME%\lib\applet.jar;%RVM_HOME%\lib\prefs.jar;%RVM_HOME%\lib\annotation.jar;%RVM_HOME%\lib\awt.jar;%RVM_HOME%\lib\xercesImpl.jar;%RVM_HOME%\lib\yoko-rmi-spec.jar;%RVM_HOME%\lib\swing.jar;%RVM_HOME%\lib\auth.jar;%RVM_HOME%\lib\yoko-core.jar;%RVM_HOME%\lib\text.jar;%RVM_HOME%\lib\jndi.jar;%RVM_HOME%\lib\suncompat.jar;%RVM_HOME%\lib\sound.jar;%RVM_HOME%\lib\bcel-5.2.jar -Duser.timezone=GMT -Djava.home=%RVM_HOME% -Djava.library.path=%RVM_HOME%\lib -Dvm.boot.library.path=%RVM_HOME%\lib -Duser.home=%USERPROFILE% -Duser.dir=%USERPROFILE% -Duser.name=%USERNAME% -Dos.name=Windows -Dos.version=0 -Dos.arch=%PROCESSOR_ARCHITECTURE% -Dpath.separator=; -Dfile.separator=\ -Dfile.encoding=ISO-8859-1 -Djava.io.tmpdir=c:\Windows\Temp
 
-set PATH=%RVM_HOME%;%PATH%
+set PATH=%RVM_HOME%\lib;%PATH%
 
 if [%1]==[-gdb] GOTO DEBUG
 

diff --git a/tools/bootloader/sysThread_Intel.c b/tools/bootloader/sysThread_Intel.c
@@ -61,7 +61,7 @@ void bootThread (void *_ip, void *_tr, void *_sp, void UNUSED *_jtoc)
       mov ebp, esp
       mov esp, _sp
       push ebp
-      call [eax]
+      call eax
       pop esp
       mov ebp, saved_ebp
   }