Changeset 30736 in vbox

Timestamp:

Jul 8, 2010 12:12:32 PM (15 years ago)

Author:

vboxsync

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

63505

Message:

bootsector2-test1.asm,++: real mode tests.

Location:

trunk/include

Files:

trunk/include/VBox/VMMDevTesting.h

-              r30724
+              r30736
 /** The XXX MMIO register - 124 RW. */
 #define VMMDEV_TESTING_MMIO_TODO        (VMMDEV_TESTING_MMIO_BASE + 0x004)
+/** The real mode selector to use.
+ * @remarks Requires that the A20 gate is enabled. */
+#define VMMDEV_TESTING_MMIO_RM_SEL       0xffff
+/** Calculate the real mode offset of a MMIO register. */
+#define VMMDEV_TESTING_MMIO_RM_OFF(val)  ((val) - 0xffff0)
 /** The base port of the I/O range used for testing. */

-              r30724
+              r30736
 %ifndef ___VBox_VMMDevTesting_h
 %define ___VBox_VMMDevTesting_h
 %define VMMDEV_TESTING_MMIO_BASE        UINT32_C(0x00101000)
 %define VMMDEV_TESTING_MMIO_SIZE        UINT32_C(0x00001000)
+%define VMMDEV_TESTING_MMIO_BASE        0x00101000
+%define VMMDEV_TESTING_MMIO_SIZE        0x00001000
 %define VMMDEV_TESTING_MMIO_NOP         (VMMDEV_TESTING_MMIO_BASE + 0x000)
 %define VMMDEV_TESTING_MMIO_TODO        (VMMDEV_TESTING_MMIO_BASE + 0x004)
+%define VMMDEV_TESTING_MMIO_RM_SEL       0xffff
+%define VMMDEV_TESTING_MMIO_RM_OFF(val)  ((val) - 0xffff0)
 %define VMMDEV_TESTING_IOPORT_BASE      0x0510
 %define VMMDEV_TESTING_IOPORT_COUNT     0x0010
 …
 %define VMMDEV_TESTING_IOPORT_TS_LOW    (VMMDEV_TESTING_IOPORT_BASE + 1)
 %define VMMDEV_TESTING_IOPORT_TS_HIGH   (VMMDEV_TESTING_IOPORT_BASE + 2)
 %define VMMDEV_TESTING_NOP_RET          UINT32_C(0x64726962)
+%define VMMDEV_TESTING_NOP_RET          0x64726962
 %endif

-              r28828
+              r30736
 %define ___VBox_param_h
 %define VBOX_MAX_ALLOC_PAGE_COUNT   (256U * _1M / PAGE_SIZE)
 %define MM_HYPER_AREA_ADDRESS       UINT32_C(0xa0000000)
+%define MM_HYPER_AREA_ADDRESS       0xa0000000
 %define MM_HYPER_AREA_MAX_SIZE      (40U * _1M)
 %define MM_HYPER_DYNAMIC_SIZE       (16U * PAGE_SIZE)
 %define MM_RAM_MIN                  UINT32_C(0x00400000)
+%define MM_RAM_MIN                  0x00400000
 %if HC_ARCH_BITS == 64
  %define MM_RAM_MAX                 UINT64_C(0x400000000)
 …
  %define MM_RAM_MAX                 UINT64_C(0x0E0000000)
 %endif
 %define MM_RAM_MIN_IN_MB            UINT32_C(4)
+%define MM_RAM_MIN_IN_MB            4
 %if HC_ARCH_BITS == 64
  %define MM_RAM_MAX_IN_MB           UINT32_C(16384)
+ %define MM_RAM_MAX_IN_MB           16384
 %else
  %define MM_RAM_MAX_IN_MB           UINT32_C(3584)
+ %define MM_RAM_MAX_IN_MB           3584
 %endif
 %define MM_RAM_HOLE_SIZE_DEFAULT    (512U * _1M)

-              r20742
+              r30736
 s/\([[:space:]][0-9][0-9]*\)ULL\([[:space:]]*\))$/\1\2)/
+s/UINT32_C([[:space:]]*\(0[xX][0-9a-fA-F][0-9a-fA-F]*\)[[:space:]]*)/\1/
+s/UINT32_C([[:space:]]*\([0-9][0-9]*\)[[:space:]]*)/\1/
 b end

-              r28828
+              r30736
 %define X86_DR7_LEN3_MASK                   (3 << 30)
 %define X86_DR7_MB1_MASK                    (RT_BIT(10))
 %define X86_DR7_L(iBp)                      ( UINT32_C(1) << (iBp * 2) )
 %define X86_DR7_G(iBp)                      ( UINT32_C(1) << (iBp * 2 + 1) )
+%define X86_DR7_L(iBp)                      ( 1 << (iBp * 2) )
+%define X86_DR7_G(iBp)                      ( 1 << (iBp * 2 + 1) )
 %define X86_DR7_RW_EO                       0
 %define X86_DR7_RW_WO                       1

-              r28800
+              r30736
 ; Global marker which is DECLASM() compatible.
 %macro GLOBALNAME 1,
+%ifndef ASM_FORMAT_BIN
 global NAME(%1)
+%endif
 NAME(%1):
 %endmacro

Note: See TracChangeset for help on using the changeset viewer.