From: John Tsiombikas <nuclear@member.fsf.org>
Date: Wed, 4 May 2022 17:56:22 +0000 (+0300)
Subject: added missing "bits 32" directives in the new asm files
X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=commitdiff_plain;h=0aeee13aa695ec617ec22253824f17209660bd39

added missing "bits 32" directives in the new asm files
---

diff --git a/src/cpuid_s.asm b/src/cpuid_s.asm
index b7b9626..b936168 100644
--- a/src/cpuid_s.asm
+++ b/src/cpuid_s.asm
@@ -1,4 +1,5 @@
 	section .text
+	bits 32
 ; foo_ are watcom functions, _foo are djgpp functions
 
 F_ID equ 0x200000
diff --git a/src/util.h b/src/util.h
index 35d1a97..50148af 100644
--- a/src/util.h
+++ b/src/util.h
@@ -235,7 +235,7 @@ static unsigned int __inline get_cs(void)
 #endif
 
 unsigned int get_cs(void);
-#define get_cpl()	((int)(get_cs() & 7))
+#define get_cpl()	((int)(get_cs() & 3))
 
 void get_msr(uint32_t msr, uint32_t *low, uint32_t *high);
 void set_msr(uint32_t msr, uint32_t low, uint32_t high);
diff --git a/src/util_s.asm b/src/util_s.asm
index 69c034a..65198b5 100644
--- a/src/util_s.asm
+++ b/src/util_s.asm
@@ -1,4 +1,5 @@
 	section .text
+	bits 32
 ; foo_ are watcom functions, _foo are djgpp functions
 
 	global get_cs