fixes from code review

bochs-emu · Nov 19, 2023 · 63fe1d4 · 63fe1d4
1 parent baba5cb
commit 63fe1d4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/bochs/config.h.in b/bochs/config.h.in
@@ -650,6 +650,10 @@ typedef Bit32u bx_phy_address;
   #error "AVX require x86-64 support"
 #endif
 
+#if BX_SUPPORT_UINTR && BX_SUPPORT_X86_64 == 0
+  #error "UINTR require x86-64 support"
+#endif
+
 #if BX_SUPPORT_EVEX && BX_SUPPORT_AVX == 0
   #error "EVEX and AVX-512 support require AVX to be compiled in"
 #endif

diff --git a/bochs/configure b/bochs/configure
@@ -24148,7 +24148,7 @@ then :
 printf "%s\n" "yes" >&6; }
     printf "%s\n" "#define BX_SUPPORT_UINTR 1" >>confdefs.h
 
-    support_cet=1
+    support_uintr=1
    elif test "$enableval" = no; then
     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }

diff --git a/bochs/configure.ac b/bochs/configure.ac
@@ -1259,7 +1259,7 @@ AC_ARG_ENABLE(cet,
   [if test "$enableval" = yes; then
     AC_MSG_RESULT(yes)
     AC_DEFINE(BX_SUPPORT_UINTR, 1)
-    support_cet=1
+    support_uintr=1
    elif test "$enableval" = no; then
     AC_MSG_RESULT(no)
     AC_DEFINE(BX_SUPPORT_UINTR, 0)

diff --git a/bochs/cpu/uintr.cc b/bochs/cpu/uintr.cc
@@ -201,7 +201,7 @@ void BX_CPP_AttrRegparmN(1) BX_CPU_C::SENDUIPI_Gq(bxInstruction_c *i)
   // |  31:24 | Reserved, MBZ
   // |  63:32 | Notification destination, 32-bit APIC/X2APIC ID
   // | 127:64 | Posted interrupt requests (PIR)
-  // |        | One bit for ech user-interrupt vector
+  // |        | One bit for each user-interrupt vector
   // --------------------------------
 
   bool send_notify = false;