- Updated tools and scripts

Run-TestWorld-PeterBochs-Debugger.bat

@@ -0,0 +1,8 @@
+cd Source
+CALL Compile-Debug.bat
+cd ..\Run
+CALL Compile.bat Mosa.TestWorld.x86.exe
+START notepad.exe build\hello.map
+START notepad.exe build\asm.txt
+CALL Run-PeterBochs-Debugger.bat
+

Run/Bochs/LaunchPeterBochsDebugger.bat

@@ -1,11 +1,9 @@
 set BOCHS=%CD%\..\..\Tools\Bochs
 set SETTINGS=%CD%
 
-
-IF EXIST "%ProgramFiles(x86)%\Java\jre6\bin\Java.exe" SET JAVA="%ProgramFiles(x86)%\Java\jre6\bin\Java.exe"
-IF EXIST "%ProgramFiles%\Java\jre6\bin\Java.exe" SET JAVA="%ProgramFiles%\Java\jre6\bin\Java.exe"
+call ..\FindJava.bat
 
 cd ..\..\Tools\peter-bochs
 call GetPeterBochs.bat
 
-%JAVA% -jar peter-bochs-debugger.jar %BOCHS%\bochsdbg.exe -q -f %SETTINGS%\peter-bochsrc.bxrc
+%JAVABIN% -jar peter-bochs-debugger.jar %BOCHS%\bochsdbg.exe -q -f %SETTINGS%\peter-bochsrc.bxrc

Run/Bochs/bochsrc-pipe.bxrc

@@ -30,3 +30,7 @@ log: bochsout.txt
 mouse: enabled=0
 
 com1: enabled=1, mode=pipe-client, dev=\\.\pipe\MOSA
+
+# enable sse
+cpuid: mmx=1, sep=1, sse=sse4_2, apic=xapic, aes=1, movbe=1, xsave=1
+

Run/Bochs/bochsrc.bxrc

@@ -28,3 +28,6 @@ log: bochsout.txt
 
 # disable the mouse, since DLX is text only
 mouse: enabled=0
+
+# enable sse
+cpuid: mmx=1, sep=1, sse=sse4_2, apic=xapic, aes=1, movbe=1, xsave=1

Run/Bochs/bochsrcdbg.bxrc

@@ -29,3 +29,8 @@ log: bochsout.txt
 # disable the mouse, since DLX is text only
 mouse: enabled=0
 magic_break: enabled=1
+
+# enable sse
+cpuid: mmx=1, sep=1, sse=sse4_2, apic=xapic, aes=1, movbe=1, xsave=1
+
+

Run/Bochs/peter-bochsrc.bxrc

@@ -3,7 +3,7 @@
 ###############################################################
 
 # how much memory the emulated machine will have
-megs: 64
+megs: 128
 
 # filename of ROM images
 romimage: file=..\..\Tools\Bochs\BIOS-bochs-latest
@@ -28,3 +28,6 @@ log: bochsout.txt
 
 # disable the mouse, since DLX is text only
 mouse: enabled=0
+
+# enable sse
+cpuid: mmx=1, sep=1, sse=sse4_2, apic=xapic, aes=1, movbe=1, xsave=1

Run/Compile.bat

@@ -7,9 +7,11 @@ if exist build\main.exe del /q /f build\main.exe
 
 cd build
 
-..\..\bin\mosacl.exe -a=x86 -f=PE --pe-file-alignment=4096 --map=hello.map -b=mb0.7 -sa -ssa -o ..\build\main.exe ..\..\bin\%1
+..\..\bin\mosacl.exe -a=x86 -f=PE --pe-file-alignment=4096 --map=hello.map -b=mb0.7 -sa -ssa -o ..\build\main.exe ..\..\bin\%1 
 
 rem -mped=..\..\bin\output 
 
 cd ..
 
+CALL Disassemble.bat
+

Run/Compile.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 [ -d build ] || mkdir build
 rm -f ./build/main.exe
-mono ../bin/mosacl.exe -a=x86 -f=PE -pe-file-alignment=4096 -b=mb0.7 -sa -ssa -o ./build/main.exe ../bin/$1
+mono ../bin/mosacl.exe -a=x86 -f=PE -b=mb0.7 -sa -ssa -o ./build/main.exe ../bin/$1

Run/FindJava.bat

@@ -0,0 +1,11 @@
+IF EXIST "%ProgramFiles(x86)%\Java\jre6\bin\java.exe" SET JAVABIN="%ProgramFiles(x86)%\Java\jre6\bin\java.exe"
+IF EXIST "%ProgramFiles%\Java\jre6\bin\java.exe" SET JAVABIN="%ProgramFiles%\Java\jre6\bin\java.exe"
+
+IF EXIST "%ProgramFiles(x86)%\Java\jre7\bin\java.exe" SET JAVABIN="%ProgramFiles(x86)%\Java\jre7\bin\java.exe"
+IF EXIST "%ProgramFiles%\Java\jre7\bin\java.exe" SET JAVABIN="%ProgramFiles%\Java\jre7\bin\bin\java.exe"
+
+IF EXIST "%ProgramFiles(x86)%\Java\jdk1.7.0\bin\java.exe" SET JAVABIN="%ProgramFiles(x86)%\Java\jdk1.7.0\bin\java.exe"
+IF EXIST "%ProgramFiles%\Java\jdk1.7.0\bin\java.exe" SET JAVABIN="%ProgramFiles%\Java\jdk1.7.0\bin\java.exe"
+
+IF EXIST "%ProgramFiles(x86)%\Java\jre7\bin\java.exe" SET JAVABIN="%ProgramFiles(x86)%\Java\jre7\bin\java.exe"
+IF EXIST "%ProgramFiles%\Java\jre7\bin\java.exe" SET JAVABIN="%ProgramFiles%\Java\jre7\bin\java.exe"

Run/JPC/LaunchJPC.bat

@@ -1,15 +1,8 @@
+call ..\FindJava.bat
+
 cd ..\..\Tools\JPC
 call GetJPC.bat
 
-IF EXIST "%ProgramFiles(x86)%\Java\jre6\bin\java.exe" SET JAVABIN="%ProgramFiles(x86)%\Java\jre6\bin\java.exe"
-IF EXIST "%ProgramFiles%\Java\jre6\bin\java.exe" SET JAVABIN="%ProgramFiles%\Java\jre6\bin\java.exe"
-
-IF EXIST "%ProgramFiles(x86)%\Java\jre7\bin\java.exe" SET JAVABIN="%ProgramFiles(x86)%\Java\jre7\bin\java.exe"
-IF EXIST "%ProgramFiles%\Java\jre7\bin\java.exe" SET JAVABIN="%ProgramFiles%\Java\jre7\bin\bin\java.exe"
-
-IF EXIST "%ProgramFiles(x86)%\Java\jdk1.7.0\bin\java.exe" SET JAVABIN="%ProgramFiles(x86)%\Java\jdk1.7.0\bin\java.exe"
-IF EXIST "%ProgramFiles%\Java\jdk1.7.0\bin\java.exe" SET JAVABIN="%ProgramFiles%\Java\jdk1.7.0\bin\java.exe"
-
 %JAVABIN% -jar JPCApplication.jar -hda ..\..\Run\build\bootimage.img -boot hda
 
 pause

Run/JPC/LaunchJPCDebugger.bat

@@ -1,13 +1,6 @@
+call ..\FindJava.bat
+
 cd ..\..\Tools\JPC
 call GetJPC.bat
 
-IF EXIST "%ProgramFiles(x86)%\Java\jre6\bin\java.exe" SET JAVABIN="%ProgramFiles(x86)%\Java\jre6\bin\java.exe"
-IF EXIST "%ProgramFiles%\Java\jre6\bin\java.exe" SET JAVABIN="%ProgramFiles%\Java\jre6\bin\java.exe"
-
-IF EXIST "%ProgramFiles(x86)%\Java\jre7\bin\java.exe" SET JAVABIN="%ProgramFiles(x86)%\Java\jre7\bin\java.exe"
-IF EXIST "%ProgramFiles%\Java\jre7\bin\java.exe" SET JAVABIN="%ProgramFiles%\Java\jre7\bin\bin\java.exe"
-
-IF EXIST "%ProgramFiles(x86)%\Java\jdk1.7.0\bin\java.exe" SET JAVABIN="%ProgramFiles(x86)%\Java\jdk1.7.0\bin\java.exe"
-IF EXIST "%ProgramFiles%\Java\jdk1.7.0\bin\java.exe" SET JAVABIN="%ProgramFiles%\Java\jdk1.7.0\bin\java.exe"
-
 %JAVABIN% -jar JPCDebugger.jar -hda ..\..\Run\build\bootimage.img -boot hda

Run/Run-PeterBochs-Debugger.bat

@@ -0,0 +1,3 @@
+..\bin\Mosa.Tool.CreateBootImage.exe IMG\mosaboot-img.config build\bootimage.img
+cd Bochs
+call LaunchPeterBochsDebugger.bat

Run/Run-QEMU.bat

@@ -1,3 +1,3 @@
 ..\bin\Mosa.Tool.CreateBootImage.exe IMG\mosaboot-img.config build\bootimage.img
 CD qemu
-CALL LaunchQemuWithServerTCP.bat
+CALL LaunchQemu.bat

Run/Run-QEMUWithTCP.bat

@@ -0,0 +1,3 @@
+..\bin\Mosa.Tool.CreateBootImage.exe IMG\mosaboot-img.config build\bootimage.img
+CD qemu
+CALL LaunchQemuWithServerTCP.bat

Tools/Bochs/version.txt

@@ -0,0 +1,2 @@
+2.6.1 [current]
+2.6.2 [doesn't work with peter-boch]

Tools/sln2nant/sln2nant.bat

@@ -1 +1 @@
-ruby sln2nant.rb ../../Source/MOSA-VS2010.sln ../../Source/
+ruby sln2nant.rb ../../Source/MOSA-VS2012.sln ../../Source/

Tools/sln2nant/sln2nant.rb

@@ -18,7 +18,7 @@ def sln2nant(solutionFile)
         if values[1].end_with?(".csproj\"")
           cleaned = values[1].strip.tr('\"', '').tr('\\', '/').tr('//', '/')
           projectFile = @baseDir + cleaned
-          if (not projectFile.include? 'Test') or (projectFile.include? 'CodeDom') or (projectFile.include? 'Mosa.Test.Collection')
+          if (not projectFile.include? 'Mosa.Test.Compiler.Framework') and (not projectFile.include? 'Mosa.Test.Debug') 
             projectFiles << projectFile
             @buildfiles << cleaned[0..cleaned.rindex('/')] + 'mosa.build'
           end