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

Timestamp:

Nov 19, 2015 11:30:50 PM (9 years ago)

Author:

vboxsync

Message:

bs3kit: Memory detection and pool init.

Location:

trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Files:

• Makefile.kmk (modified) (1 diff)
• bs3-cmn-memory.h (added)
• bs3-first-rm.asm (modified) (5 diffs)
• bs3-rm-InitMemory.c (added)
• bs3-shutdown.c (modified) (1 diff)
• bs3kit.h (modified) (2 diffs)

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

@@ -396 +396 @@
 bs3kit-common-16_ASDEFS   = RT_ASMDEFS_INC_FIRST_FILE
 bs3kit-common-16_SOURCES  = $(VBOX_BS3KIT_COMMON_SOURCES) \
-        bs3-system-data.asm
+        bs3-system-data.asm \
+        bs3-rm-InitMemory.c
 
 # The 32-bit BS3Kit library.

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-first-rm.asm

@@ -44 +44 @@
 section BS3TEXT16_END   align=2 CLASS=BS3CODE16 PUBLIC USE16
 %endif
+
+BS3_GLOBAL_DATA Bs3Text16_Size, 2
+    dw  BS3_DATA_NM(Bs3Text16_EndOfSegment) wrt BS3TEXT16
 BS3_GLOBAL_DATA Bs3Text16_EndOfSegment, 0
 
@@ -65 +68 @@
 section BS3DATA16_END   align=2   CLASS=FAR_DATA PUBLIC USE16
 %endif
+
 BS3_GLOBAL_DATA Bs3Data16_EndOfSegment, 0
 
@@ -81 +85 @@
 section BS3TEXT32_END   align=1 CLASS=BS3CODE32 PUBLIC USE32 FLAT
 %endif
+BS3_GLOBAL_DATA Bs3Data16_Size, 4
+    dd  BS3_DATA_NM(Bs3Data16_EndOfSegment) wrt BS3DATA16
 BS3_GLOBAL_DATA Bs3Text32_EndOfSegment, 0
 
@@ -115 +121 @@
 section BS3DATA64_END   align=16   CLASS=DATA PUBLIC USE32 FLAT
 %endif
+
+ALIGNDATA(16)
+    db      10,13,'eye-catcher: sizes  ',10,13
+BS3_GLOBAL_DATA Bs3Data16Thru64Text32And64_TotalSize, 4
+    dd  BS3_DATA_NM(Bs3Data64_EndOfSegment) wrt BS3DATA16
+BS3_GLOBAL_DATA Bs3TotalImageSize, 4
+    dd  BS3_DATA_NM(Bs3Data64_EndOfSegment) wrt BS3TEXT16
 BS3_GLOBAL_DATA Bs3Data64_EndOfSegment, 0
 
@@ -140 +153 @@
     db      10,13,'eye-catcher: BS3TEXT16',10,13
 .after_eye_catcher:
-mov     ax, BS3SYSTEM16
-mov     ds, ax
-lgdt    [BS3_DATA_NM(Bs3Lgdt_Gdt)]
-mov ax, X86_CR0_PE
-lmsw ax
-cli
-hlt
-
     mov     ax, BS3DATA16
     mov     es, ax

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

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

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

@@ -596 +596 @@
 
 
+/** @name Segment start and end markers, sizes.
+ * @{ */
+/** Start of the BS3TEXT16 segment.   */
+extern uint8_t BS3_DATA_NM(Bs3Text16_StartOfSegment);
+/** End of the BS3TEXT16 segment.   */
+extern uint8_t BS3_DATA_NM(Bs3Text16_EndOfSegment);
+/** The size of the BS3TEXT16 segment.   */
+extern uint8_t BS3_DATA_NM(Bs3Text16_Size);
+
+/** Start of the BS3SYSTEM16 segment.   */
+extern uint8_t BS3_DATA_NM(Bs3System16_StartOfSegment);
+/** End of the BS3SYSTEM16 segment.   */
+extern uint8_t BS3_DATA_NM(Bs3System16_EndOfSegment);
+
+/** Start of the BS3DATA16 segment.   */
+extern uint8_t BS3_DATA_NM(Bs3Data16_StartOfSegment);
+/** End of the BS3DATA16 segment.   */
+extern uint8_t BS3_DATA_NM(Bs3Data16_EndOfSegment);
+
+/** Start of the BS3TEXT32 segment.   */
+extern uint8_t BS3_DATA_NM(Bs3Text32_StartOfSegment);
+/** Start of the BS3TEXT32 segment.   */
+extern uint8_t BS3_DATA_NM(Bs3Text32_EndOfSegment);
+
+/** Start of the BS3DATA32 segment.   */
+extern uint8_t BS3_DATA_NM(Bs3Data32_StartOfSegment);
+/** Start of the BS3DATA32 segment.   */
+extern uint8_t BS3_DATA_NM(Bs3Data32_EndOfSegment);
+
+/** Start of the BS3TEXT64 segment.   */
+extern uint8_t BS3_DATA_NM(Bs3Text64_StartOfSegment);
+/** Start of the BS3TEXT64 segment.   */
+extern uint8_t BS3_DATA_NM(Bs3Text64_EndOfSegment);
+
+/** Start of the BS3DATA64 segment.   */
+extern uint8_t BS3_DATA_NM(Bs3Data64_StartOfSegment);
+/** Start of the BS3DATA64 segment.   */
+extern uint8_t BS3_DATA_NM(Bs3Data64_EndOfSegment);
+
+/** The size of the Data16, Text32, Text64, Data32 and Data64 blob. */
+extern uint8_t BS3_DATA_NM(Bs3Data16Thru64Text32And64_TotalSize);
+/** The total image size (from Text16 thu Data64). */
+extern uint8_t BS3_DATA_NM(Bs3TotalImageSize);
+/** @} */
+
+
 #ifdef __WATCOMC__
 /**
@@ -1234 +1280 @@
 
 
+/**
+ * Initializes the REAL and TILED memory pools.
+ */
+BS3_DECL(void) Bs3InitMemory_rm(void);
+
 
 /** @defgroup grp_bs3kit_mode   Mode Specific Functions and Data