Changeset 22086 for branches/swt/src

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/src

Files:

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

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
-
-
-