Changeset 60596 in vbox

Timestamp:

Apr 20, 2016 11:39:45 AM (8 years ago)

Author:

vboxsync

Message:

bs3kit: switched the default 16-bit model from compact (small code, far data) to large (far code, far data) so we won't die when using compiler intrinsics outside CGROUP16.

File:

• trunk/src/VBox/ValidationKit/bootsectors/Config.kmk (modified) (6 diffs)

trunk/src/VBox/ValidationKit/bootsectors/Config.kmk

@@ -564 +564 @@
 #       -zu                    Assume SS != DS.
 #       -mc                    Compact memory model, far data, small code.
+#       -ml                    Large memory model, far data, far code.
 #       -mf                    Flat memory model (32-bit).
 #       -d+                    Enabled better /dVAR=XXX parsing, using space as delimiter instead of alpha-numerical/whatever.
@@ -589 +590 @@
 TEMPLATE_VBoxBS3KitImg_ASTOOL       = VBoxNasm
 TEMPLATE_VBoxBS3KitImg_ASFLAGS      = -f obj -g $(BS3KIT_NASM_allow_64_bit) -w+orphan-labels
-TEMPLATE_VBoxBS3KitImg_ASDEFS       = ASM_FORMAT_OMF RT_NOINC_SEGMENTS __NASM__ ARCH_BITS=16 RT_ARCH_X86 \
+TEMPLATE_VBoxBS3KitImg_ASDEFS       = ASM_FORMAT_OMF RT_NOINC_SEGMENTS __NASM__ ARCH_BITS=16 RT_ARCH_X86 ASM_MODEL_FAR_CODE \
         BS3CLASS16CODE=$(BS3KIT_CLASS_CODE16) BS3KIT_CLASS_DATA16=$(BS3KIT_CLASS_DATA16) \
          BS3KIT_GRPNM_DATA16=$(BS3KIT_GRPNM_DATA16) BS3KIT_CLASS_BSS16=$(BS3KIT_CLASS_BSS16)
@@ -600 +601 @@
 TEMPLATE_VBoxBS3KitImg_CXXTOOL      = Bs3Ow16
 TEMPLATE_VBoxBS3KitImg_CFLAGS       = $(if $(BS3KIT_SEGNM_DATA16),-nd=$(BS3KIT_SEGNM_DATA16),) \
-        -nt=BS3TEXT16 -nc=$(BS3KIT_CLASS_CODE16) -ecc -q -0 -wx -zl -zdp -zu -mc $(BS3_OW_DBG_OPT) -s -oa -ob -of -oi -ol -or -os -d+
+        -nt=BS3TEXT16 -nc=$(BS3KIT_CLASS_CODE16) -ecc -q -0 -wx -zl -zdp -zu -ml $(BS3_OW_DBG_OPT) -s -oa -ob -of -oi -ol -or -os -d+
 TEMPLATE_VBoxBS3KitImg_CXXFLAGS     = $(if $(BS3KIT_SEGNM_DATA16),-nd=$(BS3KIT_SEGNM_DATA16),) \
-        -nt=BS3TEXT16 -nc=$(BS3KIT_CLASS_CODE16) -ecc -q -0 -wx -zl -zdp -zu -mc $(BS3_OW_DBG_OPT) -s -oa -ob -of -oi -ol -or -os -d+
+        -nt=BS3TEXT16 -nc=$(BS3KIT_CLASS_CODE16) -ecc -q -0 -wx -zl -zdp -zu -ml $(BS3_OW_DBG_OPT) -s -oa -ob -of -oi -ol -or -os -d+
 TEMPLATE_VBoxBS3KitImg_CDEFS        = ARCH_BITS=16 RT_ARCH_X86
 
@@ -618 +619 @@
 TEMPLATE_VBoxBS3KitImg_INCS         = $(VBOX_PATH_BS3KIT_SRC) .
 TEMPLATE_VBoxBS3KitImg_LDTOOL       = OPENWATCOM-WL
-#       option quiet, nofarcalls\
-#       disable 1014, 1023, 2120, 1080
 
 # linker options:
@@ -629 +628 @@
 #      option symfile:             Produce a separate symbol file with the debug info.
 #      option map:                 Produce a map file.
+#      option farcalls:            Change intrasegment far calls into 'push cs; seg ds; call symbol' where possible.
 #      option statics:             ?
 #      option verbose:             Verbose map file?
-#       option disable 1014:        Disable warning about
-#       option disable 1080:        Disable warning about
-#       option disable 1150:        Disable warning about
+#       option disable 1014:        Disable warning about 'stack segment not found'.
+#       option disable 1080:        Disable warning about '%1 is a 32-bit object file'.
 #
 # Note! We're pushing DATA16 to 0x20000 because it's impossible to force wlink
@@ -640 +639 @@
 TEMPLATE_VBoxBS3KitImg_LDFLAGS  = system dos \
         debug $(BS3_OW_DBG_LDOPT) all \
-        option quiet, map, statics, verbose, symfile, start=_start \
-       disable 1014, 1080, 1150 \
+        option quiet, map, statics, verbose, symfile, start=_start, farcalls \
+       disable 1014, 1080 \
         \
         output raw offset=0x10000 \