Changeset 17617 in vbox

Timestamp:

Mar 10, 2009 11:10:12 AM (16 years ago)

Author:

vboxsync

Message:

vbox.dsl: a shot at working around the 32-bit compile issue (I'm not quite convinced it will work).

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (1 diff)
• PC/vbox.dsl (modified) (3 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -391 +391 @@
         $(QUIET)$(VBOX_IASLCMD) -tc -vs -p $@ $<
 
+vboxaml.hex:: $$(PATH_DevicesR3)/vboxaml.hex
+
+
 # For finding PCIInternal.h from VBox/pci.h.
 Bus/DevPCI.cpp_INCS     = Bus

trunk/src/VBox/Devices/PC/vbox.dsl

@@ -896 +896 @@
                     ReadWrite,
                     0x0000000000000000,         // _GRA: Granularity.
-                    0x0000000100000000,         // _LEN: Min address, 4GB.
-                    0x00000fffffffffff,         // _MAX: Max possible address, 16TB.
+                    0 /*0x0000000100000000*/,   // _MIN: Min address, 4GB.
+                    0 /*0x00000fffffffffff*/,   // _MAX: Max possible address, 16TB.
                     0x0000000000000000,         // _TRA: Translation
                     0x0000000000000000,         // _LEN: Range length (calculated dynamically)
@@ -910 +910 @@
                 CreateDwordField (CRS, \_SB.PCI0.MEM3._MIN, RAMT)
                 CreateDwordField (CRS, \_SB.PCI0.MEM3._LEN, RAMR)
-                CreateDwordField (TOM, \_SB.PCI0.MEM4._LEN, TM4L)
+                CreateQwordField (TOM, \_SB.PCI0.MEM4._LEN, TM4L)
+                CreateQwordField (TOM, \_SB.PCI0.MEM4._LEN, TM4N)
+                CreateQwordField (TOM, \_SB.PCI0.MEM4._LEN, TM4X)
 
                 Store (MEML, RAMT)
@@ -922 +924 @@
                     // (MEMH is the memory above 4GB specified in 64KB units.)
                     //
-                    ShiftLeft (MEMH, 16, Local0)
-                    Store (Local0, TM4L)
-                    ConcatenateResTemplate (CRS, TOM, Local1)
-                    Return (Local1)
+                    // Note: ACPI v2 doesn't do 32-bit integers. IASL may fail on
+                    //       seeing 64-bit constants and the code probably wont work.
+                    //
+                    Store (1, TM4N)
+                    ShiftLeft (TM4N, 32, TM4N)
+
+                    Store (0x00000fff, TM4X)
+                    ShiftLeft (TM4X, 32, TM4X)
+                    Or (TM4X, 0xffffffff, TM4X)
+
+                    Store (MEMH, TM4L)
+                    ShiftLeft (TM4L, 16, TM4L)
+
+                    ConcatenateResTemplate (CRS, TOM, Local2)
+                    Return (Local2)
                 }