Changeset 22086 for branches

Timestamp:

Mar 10, 2015, 9:02:34 AM (11 years ago)

Author:

rousseau

Message:

Added support for JWasm

Set USE_JWASM=1 in the environment to use JWasm instead of Alp.

This is a quick hack as it does not use the existing JWASM.kmk
functionality of kBuild yet. So setting USE_JWASM:=1 in LocalConfig.kmk
will not work and JWasm must be somewhere in the PATH.

Location:

branches/swt

Files:

• Config.kmk (modified) (3 diffs)
• src/kernel32/FastInfoBlocksa.asm (modified) (2 diffs)
• src/kernel32/asmutil.asm (modified) (1 diff)
• src/rpcrt4/util.asm (modified) (2 diffs)

branches/swt/Config.kmk

@@ -194 +194 @@
 # Add support for MASM to the GCC compiler
 #
-TOOL_GXX3OMF_MASM                   = $(PATH_TOOL_ALP)
-TOOL_GXX3OMF_MASMFLAGS              = -Mb
 TOOL_GXX3OMF_COMPILE_MASM_OUTPUT    = $(outbase).lst
 TOOL_GXX3OMF_COMPILE_MASM_DEPEND    =
 TOOL_GXX3OMF_COMPILE_MASM_DEPORD    =
+
+ifn1of ($(USE_JWASM),1 y yes Y Yes t true T True)
+# Alp
+# Can crash when environment is too large.
+TOOL_GXX3OMF_MASM                   = $(PATH_TOOL_ALP)
+TOOL_GXX3OMF_MASMFLAGS              = -Mb
 define TOOL_GXX3OMF_COMPILE_MASM_CMDS
         $(QUIET)$(TOOL_GXX3OMF_MASM) -D:__GNUC__ -D:__EMX__\
@@ -207 +211 @@
                 -Fo:$(obj)
 endef
+else
+# JWasm
+# Source needs to be last otherwise -Fo drops path. (v2.06)
+$(info Note: Using JWasm as the assembler)
+TOOL_GXX3OMF_MASM                   = $(PATH_TOOL_JWASM)
+TOOL_GXX3OMF_MASMFLAGS              = -q -9
+define TOOL_GXX3OMF_COMPILE_MASM_CMDS
+        $(QUIET)$(TOOL_GXX3OMF_MASM) -D__GNUC__ -D__EMX__\
+                $(flags) $(addsuffix /,$(addprefix -I, $(incs))) $(addprefix -D, $(defs))\
+                -Fl$(outbase).lst\
+                -Fw$(outbase).err\
+                -Fo$(obj)\
+                $(source)
+endef
+endif
 
 #
@@ -313 +332 @@
 endif
 
+ifeq ($(PATH_TOOL_JWASM),)
+PATH_TOOL_JWASM := jwasm.exe
+endif
+
 ifneq ($(PATH_SDK_OS2TK4),)
 #

branches/swt/src/kernel32/FastInfoBlocksa.asm

@@ -114 +114 @@
 IFDEF __EMX__
     extrn _16_Dos16GetInfoSeg:far
-    call    _16_Dos16GetInfoSeg
+    call far ptr    _16_Dos16GetInfoSeg
 ELSE
     extrn DOS16GETINFOSEG:far
@@ -121 +121 @@
     pop     dx                          ; sel LIS
     pop     cx                          ; sel GIS
-    jmp far ptr FLAT:Thunk32_fibInit
+    jmp far ptr CODE32:Thunk32_fibInit
 CODE16 ends
 CODE32 segment

branches/swt/src/kernel32/asmutil.asm

@@ -239 +239 @@
 _clear_bit endp
 
+ifndef __JWASM__
 rdtsc           macro
                 db      0Fh, 31h
 endm
+endif
 
                 public  GetPentiumTSC
 GetPentiumTSC   proc    near
                 mov     ecx , [esp + 4]
+ifndef __JWASM__
                 rdtsc
+else
+                .586p
+                rdtsc
+                .386p
+endif
                 mov     [ecx] , eax
                 mov     [ecx + 4] , edx

branches/swt/src/rpcrt4/util.asm

@@ -18 +18 @@
 _getEAX proc    near
         ret
-endp
+_getEAX endp
 
 public  _getEDX
@@ -24 +24 @@
         mov     EAX, EDX
         ret
-endp
+_getEDX endp
 
 CODE32          ENDS
 
 END
-
-
-