[ASM] Fix boot with VS 16.7.3 / MSVC 19.27

See https://developercommunity.visualstudio.com/content/problem/1180800/ml-x86-assume-directive-causes-invalid-code-genera.html

diff --git a/boot/environ/app/rosload/i386/osxfera.s b/boot/environ/app/rosload/i386/osxfera.s
index 3a555b8..1418f16 100644 (file)
--- 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 f7c60b6..d879383 100644 (file)
--- 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 296ce0d..e176a64 100644 (file)
--- 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 57e29f3..be41fe1 100644 (file)
--- 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 3f65a55..f93bb97 100644 (file)
--- 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 f3496f0..2f80707 100644 (file)
--- 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 458fce7..afbfdf2 100644 (file)
--- 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 74f5fff..27580bc 100644 (file)
--- 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 2f33b2d..476430a 100644 (file)
--- 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)