[ros-diffs] [reactos] 01/01: [ASM] Fix boot with VS 16.7.3 / MSVC 19.27

[Timo Kreuzer]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2aca4b279563ec536f013…

commit 2aca4b279563ec536f013a4bd29f4b177e401ffe
Author:     Timo Kreuzer <timo.kreuzer(a)reactos.org>
AuthorDate: Thu Sep 10 17:25:42 2020 +0200
Commit:     Timo Kreuzer <timo.kreuzer(a)reactos.org>
CommitDate: Sat Sep 12 15:01:04 2020 +0200

    [ASM] Fix boot with VS 16.7.3 / MSVC 19.27
    
    See
https://developercommunity.visualstudio.com/content/problem/1180800/ml-x86-…
---
 boot/environ/app/rosload/i386/osxfera.s    | 1 -
 boot/environ/lib/arch/i386/transfer.s      | 1 -
 boot/freeldr/freeldr/arch/i386/multiboot.S | 2 +-
 hal/halx86/generic/systimer.S              | 5 -----
 hal/halx86/up/pic.S                        | 5 -----
 ntoskrnl/ke/i386/trap.s                    | 2 +-
 sdk/include/asm/asm.inc                    | 2 +-
 sdk/lib/crt/math/i386/alldiv_asm.s         | 4 ----
 sdk/lib/crt/math/i386/pow_asm.s            | 2 +-
 9 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/boot/environ/app/rosload/i386/osxfera.s
b/boot/environ/app/rosload/i386/osxfera.s
index 3a555b81462..1418f164b35 100644
--- a/boot/environ/app/rosload/i386/osxfera.s
+++ b/boot/environ/app/rosload/i386/osxfera.s
@@ -16,7 +16,6 @@ EXTERN _OslKernelIdt:FWORD
 
 /* FUNCTIONS ****************************************************************/
 .code
-ASSUME nothing
 
 PUBLIC _OslArchTransferToKernel
 _OslArchTransferToKernel:
diff --git a/boot/environ/lib/arch/i386/transfer.s
b/boot/environ/lib/arch/i386/transfer.s
index f7c60b6abc5..d87938363fc 100644
--- a/boot/environ/lib/arch/i386/transfer.s
+++ b/boot/environ/lib/arch/i386/transfer.s
@@ -21,7 +21,6 @@ EXTERN _BootApp32Parameters:DWORD
 
 /* FUNCTIONS ****************************************************************/
 .code
-ASSUME nothing
 
 PUBLIC _Archx86TransferTo32BitApplicationAsm
 _Archx86TransferTo32BitApplicationAsm:
diff --git a/boot/freeldr/freeldr/arch/i386/multiboot.S
b/boot/freeldr/freeldr/arch/i386/multiboot.S
index 296ce0de73f..e176a64d54c 100644
--- a/boot/freeldr/freeldr/arch/i386/multiboot.S
+++ b/boot/freeldr/freeldr/arch/i386/multiboot.S
@@ -55,7 +55,7 @@ EXTERN __bss_end__:DWORD
 
 #ifdef _USE_ML
 .MBDATA SEGMENT PUBLIC 'DATA'
-ASSUME nothing
+//ASSUME nothing
 #endif
 
     /* Align to 32 bits boundary */
diff --git a/hal/halx86/generic/systimer.S b/hal/halx86/generic/systimer.S
index 57e29f3c21e..be41fe1f179 100644
--- a/hal/halx86/generic/systimer.S
+++ b/hal/halx86/generic/systimer.S
@@ -35,11 +35,6 @@ EXTERN _DbgBreakPoint@0:PROC
 #define PIT_MODE   HEX(43)
 #define SYSTEM_CTRL_PORT_A HEX(92)
 
-/* GLOBALS *******************************************************************/
-
-.data
-ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING
-
 /* FUNCTIONS *****************************************************************/
 
 .code
diff --git a/hal/halx86/up/pic.S b/hal/halx86/up/pic.S
index 3f65a5545d8..f93bb972a01 100644
--- a/hal/halx86/up/pic.S
+++ b/hal/halx86/up/pic.S
@@ -11,11 +11,6 @@
 
 #include <ks386.inc>
 
-/* GLOBALS *******************************************************************/
-
-.data
-ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING
-
 /* FUNCTIONS *****************************************************************/
 
 .code
diff --git a/ntoskrnl/ke/i386/trap.s b/ntoskrnl/ke/i386/trap.s
index f3496f0ebc3..2f8070725d5 100644
--- a/ntoskrnl/ke/i386/trap.s
+++ b/ntoskrnl/ke/i386/trap.s
@@ -30,7 +30,7 @@ ENDM
 /* GLOBALS *******************************************************************/
 
 .data
-ASSUME nothing
+ASSUME CS:nothing
 
 .align 16
 
diff --git a/sdk/include/asm/asm.inc b/sdk/include/asm/asm.inc
index 458fce72f12..afbfdf24cd8 100644
--- a/sdk/include/asm/asm.inc
+++ b/sdk/include/asm/asm.inc
@@ -27,7 +27,7 @@ OPTION DOTNAME
 .686P
 .XMM
 .MODEL FLAT
-ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING
+ASSUME FS:NOTHING, GS:NOTHING
 #endif
 
 /* Explicit radix in MASM syntax  */
diff --git a/sdk/lib/crt/math/i386/alldiv_asm.s b/sdk/lib/crt/math/i386/alldiv_asm.s
index 74f5fff9b79..27580bcfc20 100644
--- a/sdk/lib/crt/math/i386/alldiv_asm.s
+++ b/sdk/lib/crt/math/i386/alldiv_asm.s
@@ -38,10 +38,6 @@
 
 PUBLIC __alldiv
 
- /* DATA ********************************************************************/
-.data
-ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING
-
 /* FUNCTIONS ***************************************************************/
 .code
 
diff --git a/sdk/lib/crt/math/i386/pow_asm.s b/sdk/lib/crt/math/i386/pow_asm.s
index 2f33b2d0fbe..476430a8873 100644
--- a/sdk/lib/crt/math/i386/pow_asm.s
+++ b/sdk/lib/crt/math/i386/pow_asm.s
@@ -30,7 +30,7 @@
 PUBLIC _pow
 
 .data
-ASSUME nothing
+ASSUME cs:nothing
 
 	.align ALIGNARG(4)
 	ASM_TYPE_DIRECTIVE(infinity,@object)