Changeset 58675 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Nov 12, 2015 3:47:57 PM (9 years ago)

Author:

vboxsync

Message:

bs3kit: Converted a bit more stuff and decided to got with syscalls for screen output, at least for now.

Location:

trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Files:

• Makefile.kmk (modified) (2 diffs)
• bs3-cmn-PrintChr.asm (added)
• bs3-cmn-PrintStr.c (added)
• bs3-cmn-TestData.c (added)
• bs3-cmn-TestInit.c (added)
• bs3-cmn-TestIsVmmDevTestingPresent.asm (added)
• bs3-cmn-TestSendStrCmd.asm (added)
• bs3-cmn-test.h (added)
• bs3-shutdown.c (modified) (1 diff)
• bs3kit.h (modified) (2 diffs)
• bs3kit.mac (modified) (3 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/Makefile.kmk

@@ -306 +306 @@
         bs3-cmn-Shutdown.asm \
         bs3-cmn-Panic.asm \
+        bs3-cmn-PrintChr.asm \
         bs3-cmn-PrintU32.asm \
+        bs3-cmn-PrintStr.c \
        bs3-cmn-PrintStrColonSpaces.asm \
        bs3-cmn-PrintStrSpacesColonSpace.c \
@@ -315 +317 @@
        bs3-cmn-MemPCpy.c \
        bs3-cmn-MemMove.c \
+       bs3-cmn-TestData.c \
+       bs3-cmn-TestInit.c \
+        bs3-cmn-TestSendStrCmd.asm \
+        bs3-cmn-TestIsVmmDevTestingPresent.asm \
 
 # The BS3Kit library.

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-shutdown.c

@@ -11 +11 @@
 void Main_rm(void)
 {
+    Bs3TestInit("bs3-shutdown");
+
     Bs3Shutdown();
     return;

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h

@@ -175 +175 @@
  * @param   uValue      The 32-bit value.
  */
-BS3_DECL(void) Bs3PrintU32_c16(uint32_t uValue); /**< @copydoc Bs3PrintU32_c16 */
+BS3_DECL(void) Bs3PrintU32_c16(uint32_t uValue);
 BS3_DECL(void) Bs3PrintU32_c32(uint32_t uValue); /**< @copydoc Bs3PrintU32_c16 */
 BS3_DECL(void) Bs3PrintU32_c64(uint32_t uValue); /**< @copydoc Bs3PrintU32_c16 */
 #define Bs3PrintU32 BS3_CMN_NM(Bs3PrintU32) /**< Selects #Bs3PrintU32_c16, #Bs3PrintU32_c32 or #Bs3PrintU32_c64. */
+
+/**
+ * Prints a string to the screen.
+ *
+ * @param   pszString       The string to print.
+ */
+BS3_DECL(void) Bs3PrintStr_c16(const char BS3_FAR *pszString);
+BS3_DECL(void) Bs3PrintStr_c32(const char BS3_FAR *pszString); /**< @copydoc Bs3PrintStr_c16 */
+BS3_DECL(void) Bs3PrintStr_c64(const char BS3_FAR *pszString); /**< @copydoc Bs3PrintStr_c16 */
+#define Bs3PrintStr BS3_CMN_NM(Bs3PrintStr) /**< Selects #Bs3PrintStr_c16, #Bs3PrintStr_c32 or #Bs3PrintStr_c64. */
+
+/**
+ * Prints a char to the screen.
+ *
+ * @param   ch              The character to print.
+ */
+BS3_DECL(void) Bs3PrintChr_c16(char ch);
+BS3_DECL(void) Bs3PrintChr_c32(char ch); /**< @copydoc Bs3PrintChr_c16 */
+BS3_DECL(void) Bs3PrintChr_c64(char ch); /**< @copydoc Bs3PrintChr_c16 */
+#define Bs3PrintChr BS3_CMN_NM(Bs3PrintChr) /**< Selects #Bs3PrintChr_c16, #Bs3PrintChr_c32 or #Bs3PrintChr_c64. */
+
 
 /**
@@ -257 +278 @@
 
 
+
+/**
+ * Equivalent to RTTestCreate + RTTestBanner.
+ *
+ * @param   pszTest         The test name.
+ */
+BS3_DECL(void) Bs3TestInit_c16(const char BS3_FAR *pszTest);
+BS3_DECL(void) Bs3TestInit_c32(const char BS3_FAR *pszTest); /**< @copydoc Bs3TestInit_c16 */
+BS3_DECL(void) Bs3TestInit_c64(const char BS3_FAR *pszTest); /**< @copydoc Bs3TestInit_c16 */
+#define Bs3TestInit BS3_CMN_NM(Bs3TestInit) /**< Selects #Bs3TestInit_c16, #Bs3TestInit_c32 or #Bs3TestInit_c64. */
+
+
 /** @} */
 

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.mac

@@ -262 +262 @@
 ;;
 ; Extern macro which mangles the common name correctly, redefining the unmangled
-; name with to the mangled one for ease of use.
+; name to the mangled one for ease of use.
 ;
 ; @param    %1  The unmangled common name.
@@ -272 +272 @@
  %undef  %1
  %define %1 BS3_CMN_NM(%1)
+%endmacro
+
+;;
+; Extern macro which mangles a DATA16 symbol correctly, redefining the
+; unmangled name to the mangled one for ease of use.
+;
+; @param    %1  The unmangled common name.
+;
+; @remarks  Will change to the DATA16 segment, use must switch back afterwards!
+;
+%macro BS3_EXTERN_DATA16 1
+ BS3_BEGIN_DATA16
+ extern _ %+ %1
+ %undef  %1
+ %define %1  _ %+ %1
 %endmacro
 
@@ -511 +526 @@
 
 
-%endif
-
+;; The system call vector.
+%define BS3_TRAP_SYSCALL        20h
+
+;; @name System call numbers
+;; @{
+;; Print char (cl).
+%define BS3_SYSCALL_PRINT_CHR   0ca110001h
+;; @}
+
+%endif
+