Changeset 21791 for branches/gcc-kmk/src

Timestamp:

Nov 3, 2011, 7:46:38 PM (14 years ago)

Author:

dmik

Message:

Use underscore in .asm to match extern "C" mangling.

This relates to variables as well. (at least in GCC).

Location:

branches/gcc-kmk/src/kernel32

Files:

• FastInfoBlocksa.asm (modified) (8 diffs)
• exceptions.cpp (modified) (1 diff)
• exceptutil.asm (modified) (12 diffs)

branches/gcc-kmk/src/kernel32/FastInfoBlocksa.asm

@@ -26 +26 @@
 ;*******************************************************************************
 DATA32 segment use32 dword public 'DATA'
-_gpfibLIS       dd 0
-_gfpfibLIS      dd 0
-_gpfibGIS       dd 0
-_gfpfibGIS      dd 0
-_gpfibPIB       dd 0
+__gpfibLIS       dd 0
+__gfpfibLIS      dd 0
+__gpfibGIS       dd 0
+__gfpfibGIS      dd 0
+__gpfibPIB       dd 0
 DATA32 ends
-
-extrn fibDumpAll:near
 
 
@@ -39 +37 @@
 ;* Exported Symbols                                                            *
 ;*******************************************************************************
-public _gpfibLIS
-public _gfpfibLIS
-public _gpfibGIS
-public _gfpfibGIS
-public _gpfibPIB
-public fibInit
+public __gpfibLIS
+public __gfpfibLIS
+public __gpfibGIS
+public __gfpfibGIS
+public __gpfibPIB
+public _fibInit
 
 
@@ -62 +60 @@
 ; @remark
 ;
-fibInit proc near
+_fibInit proc near
     push    ebp
     mov     ebp, esp
-    cmp     _gpfibPIB, 0
+    cmp     __gpfibPIB, 0
     jz      @doinit
     jmp     @exit_ok
@@ -114 +112 @@
     push    ss
     push    dx
+IFDEF __EMX__
+    extrn _16_Dos16GetInfoSeg:far
+    call    _16_Dos16GetInfoSeg
+ELSE
     extrn DOS16GETINFOSEG:far
     call    DOS16GETINFOSEG
+ENDIF
     pop     dx                          ; sel LIS
     pop     cx                          ; sel GIS
@@ -148 +151 @@
     ; Store far pointers.
     ;
-    mov     word ptr [_gfpfibLIS + 2], dx
-    mov     word ptr [_gfpfibGIS + 2], cx
+    mov     word ptr [__gfpfibLIS + 2], dx
+    mov     word ptr [__gfpfibGIS + 2], cx
 
     ;
@@ -156 +159 @@
     and     edx, 0fff8h
     shl     edx, 13
-    mov     [_gpfibLIS], edx
+    mov     [__gpfibLIS], edx
 
     and     ecx, 0fff8h
     shl     ecx, 13
-    mov     [_gpfibGIS], ecx
+    mov     [__gpfibGIS], ecx
 
 
@@ -178 +181 @@
     pop     eax                         ; ptib, ignore.
     pop     eax                         ; ppib
-    mov     [_gpfibPIB], eax
+    mov     [__gpfibPIB], eax
 
     ;
@@ -188 +191 @@
     leave
     ret
-fibInit endp
+_fibInit endp
 
 

branches/gcc-kmk/src/kernel32/exceptions.cpp

@@ -309 +309 @@
 
 #if 1
+extern "C"
 DWORD EXC_CallHandler( WINEXCEPTION_RECORD *record, WINEXCEPTION_FRAME *frame,
                        WINCONTEXT *context, WINEXCEPTION_FRAME **dispatcher,

branches/gcc-kmk/src/kernel32/exceptutil.asm

@@ -34 +34 @@
 CODE32          SEGMENT DWORD PUBLIC USE32 'CODE'
         public  _RaiseException@16
-        extrn   OS2RAISEEXCEPTION : near
+        extrn   _OS2RaiseException : near
 
 _RaiseException@16 proc near
@@ -65 +65 @@
         mov  eax, ss
         push eax
-        call OS2RAISEEXCEPTION
+        call _OS2RaiseException
 
         ret 16      ;__stdcall
@@ -71 +71 @@
 
         public  _RtlUnwind@16
-        extrn   OS2RtlUnwind : near
+        extrn   _OS2RtlUnwind : near
 
 _RtlUnwind@16 proc near
@@ -102 +102 @@
         mov  eax, ss
         push eax
-        call OS2RtlUnwind
+        call _OS2RtlUnwind
 
         ret 16      ;__stdcall
@@ -118 +118 @@
 OS2ExceptionHandler endp
 
-        PUBLIC QueryExceptionChain
-
-QueryExceptionChain proc near
+        PUBLIC _QueryExceptionChain
+
+_QueryExceptionChain proc near
         mov  eax, fs:[0]
         ret
-QueryExceptionChain endp
+_QueryExceptionChain endp
 
         PUBLIC GetExceptionRecord
@@ -280 +280 @@
 
 
-; 281 static DWORD EXC_CallHandler( WINEXCEPTION_RECORD *record, WINEXCEPTION_FRAME *frame,
+; 281 static extern "C" DWORD EXC_CallHandler( WINEXCEPTION_RECORD *record, WINEXCEPTION_FRAME *frame,
         EXTRN WriteLog:PROC
         EXTRN _GetThreadTEB@0:PROC
@@ -287 +287 @@
 ENDIF
 
-EXC_push_frame__FP19_WINEXCEPTION_FRAME proc
+EXC_push_frame  proc
         push    ebp
         mov     ebp,esp
@@ -313 +313 @@
         leave   
         ret     
-EXC_push_frame__FP19_WINEXCEPTION_FRAME endp
+EXC_push_frame  endp
 
 ; 138 static inline WINEXCEPTION_FRAME * EXC_pop_frame( WINEXCEPTION_FRAME *frame )
         align 04h
 
-EXC_pop_frame__FP19_WINEXCEPTION_FRAME  proc
+EXC_pop_frame   proc
         push    ebp
         mov     ebp,esp
@@ -339 +339 @@
         leave   
         ret     
-EXC_pop_frame__FP19_WINEXCEPTION_FRAME  endp
+EXC_pop_frame   endp
 
         align 04h
-        PUBLIC EXC_CallHandler__FP20_WINEXCEPTION_RECORDP19_WINEXCEPTION_FRAMEP10WINCONTEXTPP19_WINEXCEPTION_FRAMEPFP20_WINEXCEPTION_RECORDP19_WINEXCEPTION_FRAMEP10WINCONTEXTPv_UlT5
-
-EXC_CallHandler__FP20_WINEXCEPTION_RECORDP19_WINEXCEPTION_FRAMEP10WINCONTEXTPP19_WINEXCEPTION_FRAMEPFP20_WINEXCEPTION_RECORDP19_WINEXCEPTION_FRAMEP10WINCONTEXTPv_UlT5  proc
+        PUBLIC _EXC_CallHandler
+
+_EXC_CallHandler        proc
         push    ebp
         mov     ebp,esp
@@ -363 +363 @@
 ; 298     EXC_push_frame( &newframe.frame );
         lea     eax,[ebp-0ch];  newframe
-        call    EXC_push_frame__FP19_WINEXCEPTION_FRAME
+        call    EXC_push_frame
 
 ; 299     dprintf(("KERNEL32: Calling handler at %p code=%lx flags=%lx\n",
@@ -403 +403 @@
 ; 303     EXC_pop_frame( &newframe.frame );
         lea     eax,[ebp-0ch];  newframe
-        call    EXC_pop_frame__FP19_WINEXCEPTION_FRAME
+        call    EXC_pop_frame
 
 ; 304     return ret;
@@ -410 +410 @@
         leave   
         ret     
-EXC_CallHandler__FP20_WINEXCEPTION_RECORDP19_WINEXCEPTION_FRAMEP10WINCONTEXTPP19_WINEXCEPTION_FRAMEPFP20_WINEXCEPTION_RECORDP19_WINEXCEPTION_FRAMEP10WINCONTEXTPv_UlT5  endp
+_EXC_CallHandler        endp
 
 CODE32          ENDS