Changeset 75129 in vbox for trunk/src/VBox/Runtime/common/math

Timestamp:

Oct 28, 2018 5:00:27 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

126206

Message:

IPRT: Make Watcom C an alterntive for compiling the OS/2 kernel code (GA mainly), governed by VBOX_USE_WATCOM_FOR_OS2.

Location:

trunk/src/VBox/Runtime/common/math/watcom

Files:

• . (added)
• I8D-x86-32.asm (copied) (copied from trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-wc32-U8D.asm ) (3 diffs)
• RTWatcomUInt64Div.c (copied) (copied from trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-UInt64Div.c ) (1 diff)
• U8D-x86-32.asm (copied) (copied from trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-wc32-U8D.asm ) (3 diffs)
• U8LS-x86-32.asm (copied) (copied from trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-wc32-U8LS.asm ) (2 diffs)
• U8M-I8M-x86-32.asm (added)
• U8RS-x86-32.asm (copied) (copied from trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-wc32-U8RS.asm ) (2 diffs)

trunk/src/VBox/Runtime/common/math/watcom/I8D-x86-32.asm

@@ -1 +1 @@
 ; $Id$
 ;; @file
-; BS3Kit - 32-bit Watcom C/C++, 64-bit unsigned integer division.
+; BS3Kit - 32-bit Watcom C/C++, 64-bit signed integer division.
 ;
 
@@ -25 +25 @@
 ;
 
-%include "bs3kit-template-header.mac"
+%include "iprt/asmdefs.mac"
 
-BS3_EXTERN_CMN Bs3UInt64Div
+
+BEGINCODE
+
+extern __U8D
 
 
 ;;
-; 64-bit unsigned integer division.
+; 64-bit signed integer division.
 ;
 ; @returns  EDX:EAX Quotient, ECX:EBX Remainder.
@@ -37 +40 @@
 ; @param    ECX:EBX     Divisor
 ;
-global $??U8D
-$??U8D:
+global __I8D
+__I8D:
         ;
-        ; Convert to a C __cdecl call - not doing this in assembly.
+        ; We use __U8D to do the work, we take care of the signedness.
         ;
+        or      edx, edx
+        js      .negative_dividend
 
-        ; Set up a frame, allocating 16 bytes for the result buffer.
-        push    ebp
-        mov     ebp, esp
-        sub     esp, 10h
+        or      ecx, ecx
+        js      .negative_divisor_positive_dividend
+        jmp     __U8D
 
-        ; Pointer to the return buffer.
-        push    esp
 
-        ; The divisor.
-        push    ecx
-        push    ebx
+.negative_divisor_positive_dividend:
+        ; negate the divisor, do unsigned division, and negate the quotient.
+        neg     ecx
+        neg     ebx
+        sbb     ecx, 0
 
-        ; The dividend.
-        push    edx
-        push    eax
+        call    __U8D
 
-        call    Bs3UInt64Div
-
-        ; Load the result.
-        mov     ecx, [ebp - 10h + 12]
-        mov     ebx, [ebp - 10h + 8]
-        mov     edx, [ebp - 10h + 4]
-        mov     eax, [ebp - 10h]
-
-        leave
+        neg     edx
+        neg     eax
+        sbb     edx, 0
         ret
 
+.negative_dividend:
+        neg     edx
+        neg     eax
+        sbb     edx, 0
+
+        or      ecx, ecx
+        js      .negative_dividend_negative_divisor
+
+.negative_dividend_positive_divisor:
+        ; negate the dividend (above), do unsigned division, and negate both quotient and remainder
+        call    __U8D
+
+        neg     edx
+        neg     eax
+        sbb     edx, 0
+
+.return_negated_remainder:
+        neg     ecx
+        neg     ebx
+        sbb     ecx, 0
+        ret
+
+.negative_dividend_negative_divisor:
+        ; negate both dividend (above) and divisor, do unsigned division, and negate the remainder.
+        neg     ecx
+        neg     ebx
+        sbb     ecx, 0
+
+        call    __U8D
+        jmp     .return_negated_remainder
+

trunk/src/VBox/Runtime/common/math/watcom/RTWatcomUInt64Div.c

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include <bs3kit.h>
 #include <iprt/uint64.h>
 
 
-#undef Bs3UInt64Div
-BS3_CMN_DEF(void, Bs3UInt64Div,(RTUINT64U uDividend, RTUINT64U uDivisor, RTUINT64U BS3_FAR *paQuotientReminder))
+DECLASM(void) RTWatcomUInt64Div(RTUINT64U uDividend, RTUINT64U uDivisor, RTUINT64U RT_FAR *paQuotientReminder)
 {
     RTUInt64DivRem(&paQuotientReminder[0], &paQuotientReminder[1], &uDividend, &uDivisor);

trunk/src/VBox/Runtime/common/math/watcom/U8D-x86-32.asm

@@ -25 +25 @@
 ;
 
-%include "bs3kit-template-header.mac"
+%include "iprt/asmdefs.mac"
 
-BS3_EXTERN_CMN Bs3UInt64Div
+
+BEGINCODE
+
+extern NAME(RTWatcomUInt64Div)
 
 
@@ -37 +40 @@
 ; @param    ECX:EBX     Divisor
 ;
-global $??U8D
-$??U8D:
+global __U8D
+__U8D:
         ;
         ; Convert to a C __cdecl call - not doing this in assembly.
@@ -59 +62 @@
         push    eax
 
-        call    Bs3UInt64Div
+        call    NAME(RTWatcomUInt64Div)
 
         ; Load the result.

trunk/src/VBox/Runtime/common/math/watcom/U8LS-x86-32.asm

@@ -25 +25 @@
 ;
 
-%include "bs3kit-template-header.mac"
+%include "iprt/asmdefs.mac"
 
+
+BEGINCODE
 
 ;;
@@ -35 +37 @@
 ; @param    BL          Shift count (it's specified as ECX:EBX, but we only use BL).
 ;
-global $??U8LS
-$??U8LS:
-global $??I8LS
-$??I8LS:
+global __U8LS
+__U8LS:
+global __I8LS
+__I8LS:
         push    ecx                     ; We're allowed to trash ECX, but why bother.
 

trunk/src/VBox/Runtime/common/math/watcom/U8RS-x86-32.asm

@@ -25 +25 @@
 ;
 
-%include "bs3kit-template-header.mac"
+%include "iprt/asmdefs.mac"
+
+
+BEGINCODE
 
 
@@ -35 +38 @@
 ; @param    BL          Shift count (it's specified as ECX:EBX, but we only use BL).
 ;
-global $??U8RS
-$??U8RS:
+global __U8RS
+__U8RS:
         push    ecx                     ; We're allowed to trash ECX, but why bother.