Changeset 59210 in vbox

Timestamp:

Dec 22, 2015 11:30:24 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

104836

Message:

bs3kit: segment grouping solving sym file issues (codeview).

Location:

trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Files:

• bs3-first-common.mac (modified) (3 diffs)
• bs3kit.mac (modified) (2 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-first-common.mac

@@ -93 +93 @@
 
 %ifndef ASM_FORMAT_ELF
-GROUP BS3DATA16_GROUP BS3DATA16 BS3DATA16CONST BS3DATA16CONST2 BS3DATA16_END
+GROUP BS3DATA16_GROUP BS3DATA16 BS3DATA16_DATA BS3DATA16CONST BS3DATA16CONST2 BS3DATA16_END
 %endif
 
@@ -144 +144 @@
 section BS3DATA32_END   align=16   progbits alloc noexec write
 %else
-section BS3DATA32_END   align=16   CLASS=FAR_DATA PUBLIC USE32 FLAT
+section BS3DATA32CONST  align=16   CLASS=FAR_DATA PUBLIC USE32
+section BS3DATA32CONST2 align=16   CLASS=FAR_DATA PUBLIC USE32
+section BS3DATA32_DATA  align=16   CLASS=FAR_DATA PUBLIC USE32
+section BS3DATA32_END   align=16   CLASS=FAR_DATA PUBLIC USE32
 %endif
 BS3_GLOBAL_DATA Bs3Data32_EndOfSegment, 0
+
+%ifndef ASM_FORMAT_ELF
+GROUP BS3DATA32_GROUP BS3DATA32 BS3DATA32_DATA BS3DATA32CONST BS3DATA32CONST2 BS3DATA32_END
+%endif
 
 ;
@@ -157 +164 @@
 section BS3DATA64_END   align=16   progbits alloc noexec write
 %else
-section BS3DATA64_END   align=16   CLASS=DATA PUBLIC USE32 FLAT
+;section .data           align=8    CLASS=DATA PUBLIC USE32
+;section .rdata          align=8    CLASS=DATA PUBLIC USE32
+;section .xdata          align=8    CLASS=DATA PUBLIC USE32
+;section .pdata          align=8    CLASS=DATA PUBLIC USE32
+;section .bss            align=8    CLASS=DATA PUBLIC USE32
+section BS3DATA64_END   align=16   CLASS=DATA PUBLIC USE32
 %endif
 BS3_GLOBAL_DATA Bs3Data64_EndOfSegment, 0
+
+%ifndef ASM_FORMAT_ELF
+;GROUP BS3DATA64_GROUP BS3DATA64 .data .rdata .xdata .pdata .bss BS3DATA64_END
+GROUP DGROUP BS3DATA64 BS3DATA64_END
+%endif
 
 

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

@@ -192 +192 @@
         section BS3DATA32 align=16 progbits alloc noexec write
   %else
-        section BS3DATA32 align=16 CLASS=FAR_DATA PUBLIC USE32 FLAT
+        section BS3DATA32 align=16 CLASS=FAR_DATA PUBLIC USE32 ;FLAT - compiler doesn't make data flat.
   %endif
  %else
@@ -220 +220 @@
         section BS3DATA64 align=16 progbits alloc noexec write
   %else
-        section BS3DATA64 align=16 CLASS=DATA PUBLIC USE32 FLAT  ; class=DATA here because of 64-bit cl and/or wlink.exe
+        section BS3DATA64 align=16 CLASS=DATA PUBLIC USE32 ;FLAT (see DATA32) ; class=DATA here because of 64-bit cl and/or wlink.exe
   %endif
  %else