diff --git a/makefile b/makefile index 574e90d..4263b74 100644 --- a/makefile +++ b/makefile @@ -19,14 +19,14 @@ covpreproc: covpreproc.c umka_shell: umka_shell.o umka.o shell.o trace.o trace_lbr.o vdisk.o vnet.o \ lodepng.o pci.o thread.o - $(CC) $(LDFLAGS_32) $^ -o $@ -static + $(CC) $(LDFLAGS_32) $^ -o $@ -static -T umka.ld umka_fuse: umka_fuse.o umka.o trace.o trace_lbr.o vdisk.o pci.o thread.o - $(CC) $(LDFLAGS_32) $^ -o $@ `pkg-config fuse3 --libs` + $(CC) $(LDFLAGS_32) $^ -o $@ `pkg-config fuse3 --libs` -T umka.ld umka_os: umka_os.o umka.o shell.o lodepng.o vdisk.o vnet.o trace.o trace_lbr.o \ pci.o thread.o umka_ping.o - $(CC) $(LDFLAGS_32) $^ -o $@ -static + $(CC) $(LDFLAGS_32) $^ -o $@ -static -T umka.ld umka.o umka.fas: umka.asm INCLUDE="$(KOLIBRI)/kernel/trunk;$(KOLIBRI)/programs/develop/libraries/libcrash/trunk" \ diff --git a/test/026_#acpi_m000.ref.log b/test/026_#acpi_m000.ref.log index a8e9b5e..dfdbd26 100644 --- a/test/026_#acpi_m000.ref.log +++ b/test/026_#acpi_m000.ref.log @@ -55473,7 +55473,7 @@ aml._.term_obj end \OSSP Integer = 0x0000000000000000 \LINX Integer = 0x0000000000000000 \TPOS Integer = 0x0000000000000000 -\OSTB Integer = 0x00000000FFFFFFFF +\OSTB Integer = 0xFFFFFFFFFFFFFFFF \_WAK Method length:0x00000057 Args:1 serialize:0 sync_level:0 \_PTS Method length:0x00000032 Args:1 serialize:0 sync_level:0 \_S5_ Package elements:4 @@ -55523,7 +55523,7 @@ aml._.term_obj end \ACMA RegionField Rgn [\ACMS] Off:00000008 Len:00000008 Acc:1 \ACMX RegionField Rgn [\ACMS] Off:00000000 Len:00000008 Acc:1 \ACMS OpRegion [SystemIO] Len:00000002 -\OSTY Integer = 0x00000000FFFFFFFF +\OSTY Integer = 0xFFFFFFFFFFFFFFFF \P80H RegionField Rgn [\DEB2] Off:00000000 Len:00000010 Acc:2 \DEB2 OpRegion [SystemIO] Len:00000002 \VGAF Integer = 0x0000000000000001 @@ -55548,7 +55548,7 @@ aml._.term_obj end Integer = 0x0000000000000000 \MCTH Method length:0x00000047 Args:2 serialize:0 sync_level:0 \OSFL Method length:0x0000027E Args:0 serialize:0 sync_level:0 -\OSVR Integer = 0x00000000FFFFFFFF +\OSVR Integer = 0xFFFFFFFFFFFFFFFF \_PIC Method length:0x00000019 Args:1 serialize:0 sync_level:0 \PICM Integer = 0x0000000000000000 \RBAL Integer = 0x000000000000000A @@ -55684,18 +55684,18 @@ aml._.term_obj end \_SB_\BAT0\PBIX Package elements:20 Integer = 0x0000000000000000 Integer = 0x0000000000000000 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000000001 - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x00000000000019B4 Integer = 0x0000000000001086 Integer = 0x00000000000001A7 Integer = 0x0000000000000075 - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000017318 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x00000000000007D0 Integer = 0x00000000000001F4 String Len:0x00000004 value:BAT1 @@ -55704,10 +55704,10 @@ aml._.term_obj end String Len:0x00000001 value: \_SB_\BAT0\PBIF Package elements:13 Integer = 0x0000000000000001 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000000001 - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x00000000000019B4 Integer = 0x0000000000001086 Integer = 0x00000000000001A7 @@ -55718,9 +55718,9 @@ aml._.term_obj end String Len:0x00000001 value: \_SB_\BAT0\PBST Package elements:4 Integer = 0x0000000000000000 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF \_SB_\BAT0\_PCL Package elements:1 Deferred _SB_PBST \_SB_\BAT0\_HID Integer = 0x000000000A0CD041 @@ -73435,7 +73435,7 @@ aml._.term_obj end \OSSP Integer = 0x0000000000000000 \LINX Integer = 0x0000000000000000 \TPOS Integer = 0x0000000000000000 -\OSTB Integer = 0x00000000FFFFFFFF +\OSTB Integer = 0xFFFFFFFFFFFFFFFF \_WAK Method length:0x00000057 Args:1 serialize:0 sync_level:0 \_PTS Method length:0x00000032 Args:1 serialize:0 sync_level:0 \_S5_ Package elements:4 @@ -73485,7 +73485,7 @@ aml._.term_obj end \ACMA RegionField Rgn [\ACMS] Off:00000008 Len:00000008 Acc:1 \ACMX RegionField Rgn [\ACMS] Off:00000000 Len:00000008 Acc:1 \ACMS OpRegion [SystemIO] Len:00000002 -\OSTY Integer = 0x00000000FFFFFFFF +\OSTY Integer = 0xFFFFFFFFFFFFFFFF \P80H RegionField Rgn [\DEB2] Off:00000000 Len:00000010 Acc:2 \DEB2 OpRegion [SystemIO] Len:00000002 \VGAF Integer = 0x0000000000000001 @@ -73510,7 +73510,7 @@ aml._.term_obj end Integer = 0x0000000000000000 \MCTH Method length:0x00000047 Args:2 serialize:0 sync_level:0 \OSFL Method length:0x0000027E Args:0 serialize:0 sync_level:0 -\OSVR Integer = 0x00000000FFFFFFFF +\OSVR Integer = 0xFFFFFFFFFFFFFFFF \_PIC Method length:0x00000019 Args:1 serialize:0 sync_level:0 \PICM Integer = 0x0000000000000000 \RBAL Integer = 0x000000000000000A @@ -74125,18 +74125,18 @@ aml._.term_obj end \_SB_\BAT0\PBIX Package elements:20 Integer = 0x0000000000000000 Integer = 0x0000000000000000 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000000001 - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x00000000000019B4 Integer = 0x0000000000001086 Integer = 0x00000000000001A7 Integer = 0x0000000000000075 - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000017318 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x00000000000007D0 Integer = 0x00000000000001F4 String Len:0x00000004 value:BAT1 @@ -74145,10 +74145,10 @@ aml._.term_obj end String Len:0x00000001 value: \_SB_\BAT0\PBIF Package elements:13 Integer = 0x0000000000000001 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000000001 - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x00000000000019B4 Integer = 0x0000000000001086 Integer = 0x00000000000001A7 @@ -74159,9 +74159,9 @@ aml._.term_obj end String Len:0x00000001 value: \_SB_\BAT0\PBST Package elements:4 Integer = 0x0000000000000000 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF \_SB_\BAT0\_PCL Package elements:1 Deferred _SB_PBST \_SB_\BAT0\_HID Integer = 0x000000000A0CD041 @@ -86685,7 +86685,7 @@ aml._.term_obj end \OSSP Integer = 0x0000000000000000 \LINX Integer = 0x0000000000000000 \TPOS Integer = 0x0000000000000000 -\OSTB Integer = 0x00000000FFFFFFFF +\OSTB Integer = 0xFFFFFFFFFFFFFFFF \_WAK Method length:0x00000057 Args:1 serialize:0 sync_level:0 \_PTS Method length:0x00000032 Args:1 serialize:0 sync_level:0 \_S5_ Package elements:4 @@ -86735,7 +86735,7 @@ aml._.term_obj end \ACMA RegionField Rgn [\ACMS] Off:00000008 Len:00000008 Acc:1 \ACMX RegionField Rgn [\ACMS] Off:00000000 Len:00000008 Acc:1 \ACMS OpRegion [SystemIO] Len:00000002 -\OSTY Integer = 0x00000000FFFFFFFF +\OSTY Integer = 0xFFFFFFFFFFFFFFFF \P80H RegionField Rgn [\DEB2] Off:00000000 Len:00000010 Acc:2 \DEB2 OpRegion [SystemIO] Len:00000002 \VGAF Integer = 0x0000000000000001 @@ -86760,7 +86760,7 @@ aml._.term_obj end Integer = 0x0000000000000000 \MCTH Method length:0x00000047 Args:2 serialize:0 sync_level:0 \OSFL Method length:0x0000027E Args:0 serialize:0 sync_level:0 -\OSVR Integer = 0x00000000FFFFFFFF +\OSVR Integer = 0xFFFFFFFFFFFFFFFF \_PIC Method length:0x00000019 Args:1 serialize:0 sync_level:0 \PICM Integer = 0x0000000000000000 \RBAL Integer = 0x000000000000000A @@ -87375,18 +87375,18 @@ aml._.term_obj end \_SB_\BAT0\PBIX Package elements:20 Integer = 0x0000000000000000 Integer = 0x0000000000000000 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000000001 - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x00000000000019B4 Integer = 0x0000000000001086 Integer = 0x00000000000001A7 Integer = 0x0000000000000075 - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000017318 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x00000000000007D0 Integer = 0x00000000000001F4 String Len:0x00000004 value:BAT1 @@ -87395,10 +87395,10 @@ aml._.term_obj end String Len:0x00000001 value: \_SB_\BAT0\PBIF Package elements:13 Integer = 0x0000000000000001 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000000001 - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x00000000000019B4 Integer = 0x0000000000001086 Integer = 0x00000000000001A7 @@ -87409,9 +87409,9 @@ aml._.term_obj end String Len:0x00000001 value: \_SB_\BAT0\PBST Package elements:4 Integer = 0x0000000000000000 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF \_SB_\BAT0\_PCL Package elements:1 Deferred _SB_PBST \_SB_\BAT0\_HID Integer = 0x000000000A0CD041 @@ -92326,7 +92326,7 @@ aml._.term_obj end \OSSP Integer = 0x0000000000000000 \LINX Integer = 0x0000000000000000 \TPOS Integer = 0x0000000000000000 -\OSTB Integer = 0x00000000FFFFFFFF +\OSTB Integer = 0xFFFFFFFFFFFFFFFF \_WAK Method length:0x00000057 Args:1 serialize:0 sync_level:0 \_PTS Method length:0x00000032 Args:1 serialize:0 sync_level:0 \_S5_ Package elements:4 @@ -92376,7 +92376,7 @@ aml._.term_obj end \ACMA RegionField Rgn [\ACMS] Off:00000008 Len:00000008 Acc:1 \ACMX RegionField Rgn [\ACMS] Off:00000000 Len:00000008 Acc:1 \ACMS OpRegion [SystemIO] Len:00000002 -\OSTY Integer = 0x00000000FFFFFFFF +\OSTY Integer = 0xFFFFFFFFFFFFFFFF \P80H RegionField Rgn [\DEB2] Off:00000000 Len:00000010 Acc:2 \DEB2 OpRegion [SystemIO] Len:00000002 \VGAF Integer = 0x0000000000000001 @@ -92401,7 +92401,7 @@ aml._.term_obj end Integer = 0x0000000000000000 \MCTH Method length:0x00000047 Args:2 serialize:0 sync_level:0 \OSFL Method length:0x0000027E Args:0 serialize:0 sync_level:0 -\OSVR Integer = 0x00000000FFFFFFFF +\OSVR Integer = 0xFFFFFFFFFFFFFFFF \_PIC Method length:0x00000019 Args:1 serialize:0 sync_level:0 \PICM Integer = 0x0000000000000000 \RBAL Integer = 0x000000000000000A @@ -93016,18 +93016,18 @@ aml._.term_obj end \_SB_\BAT0\PBIX Package elements:20 Integer = 0x0000000000000000 Integer = 0x0000000000000000 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000000001 - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x00000000000019B4 Integer = 0x0000000000001086 Integer = 0x00000000000001A7 Integer = 0x0000000000000075 - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000017318 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x00000000000007D0 Integer = 0x00000000000001F4 String Len:0x00000004 value:BAT1 @@ -93036,10 +93036,10 @@ aml._.term_obj end String Len:0x00000001 value: \_SB_\BAT0\PBIF Package elements:13 Integer = 0x0000000000000001 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000000001 - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x00000000000019B4 Integer = 0x0000000000001086 Integer = 0x00000000000001A7 @@ -93050,9 +93050,9 @@ aml._.term_obj end String Len:0x00000001 value: \_SB_\BAT0\PBST Package elements:4 Integer = 0x0000000000000000 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF \_SB_\BAT0\_PCL Package elements:1 Deferred _SB_PBST \_SB_\BAT0\_HID Integer = 0x000000000A0CD041 @@ -98455,7 +98455,7 @@ aml._.term_obj end \OSSP Integer = 0x0000000000000000 \LINX Integer = 0x0000000000000000 \TPOS Integer = 0x0000000000000000 -\OSTB Integer = 0x00000000FFFFFFFF +\OSTB Integer = 0xFFFFFFFFFFFFFFFF \_WAK Method length:0x00000057 Args:1 serialize:0 sync_level:0 \_PTS Method length:0x00000032 Args:1 serialize:0 sync_level:0 \_S5_ Package elements:4 @@ -98505,7 +98505,7 @@ aml._.term_obj end \ACMA RegionField Rgn [\ACMS] Off:00000008 Len:00000008 Acc:1 \ACMX RegionField Rgn [\ACMS] Off:00000000 Len:00000008 Acc:1 \ACMS OpRegion [SystemIO] Len:00000002 -\OSTY Integer = 0x00000000FFFFFFFF +\OSTY Integer = 0xFFFFFFFFFFFFFFFF \P80H RegionField Rgn [\DEB2] Off:00000000 Len:00000010 Acc:2 \DEB2 OpRegion [SystemIO] Len:00000002 \VGAF Integer = 0x0000000000000001 @@ -98530,7 +98530,7 @@ aml._.term_obj end Integer = 0x0000000000000000 \MCTH Method length:0x00000047 Args:2 serialize:0 sync_level:0 \OSFL Method length:0x0000027E Args:0 serialize:0 sync_level:0 -\OSVR Integer = 0x00000000FFFFFFFF +\OSVR Integer = 0xFFFFFFFFFFFFFFFF \_PIC Method length:0x00000019 Args:1 serialize:0 sync_level:0 \PICM Integer = 0x0000000000000000 \RBAL Integer = 0x000000000000000A @@ -99145,18 +99145,18 @@ aml._.term_obj end \_SB_\BAT0\PBIX Package elements:20 Integer = 0x0000000000000000 Integer = 0x0000000000000000 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000000001 - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x00000000000019B4 Integer = 0x0000000000001086 Integer = 0x00000000000001A7 Integer = 0x0000000000000075 - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000017318 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x00000000000007D0 Integer = 0x00000000000001F4 String Len:0x00000004 value:BAT1 @@ -99165,10 +99165,10 @@ aml._.term_obj end String Len:0x00000001 value: \_SB_\BAT0\PBIF Package elements:13 Integer = 0x0000000000000001 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000000001 - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x00000000000019B4 Integer = 0x0000000000001086 Integer = 0x00000000000001A7 @@ -99179,9 +99179,9 @@ aml._.term_obj end String Len:0x00000001 value: \_SB_\BAT0\PBST Package elements:4 Integer = 0x0000000000000000 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF \_SB_\BAT0\_PCL Package elements:1 Deferred _SB_PBST \_SB_\BAT0\_HID Integer = 0x000000000A0CD041 @@ -105133,7 +105133,7 @@ aml._.term_obj end \OSSP Integer = 0x0000000000000000 \LINX Integer = 0x0000000000000000 \TPOS Integer = 0x0000000000000000 -\OSTB Integer = 0x00000000FFFFFFFF +\OSTB Integer = 0xFFFFFFFFFFFFFFFF \_WAK Method length:0x00000057 Args:1 serialize:0 sync_level:0 \_PTS Method length:0x00000032 Args:1 serialize:0 sync_level:0 \_S5_ Package elements:4 @@ -105183,7 +105183,7 @@ aml._.term_obj end \ACMA RegionField Rgn [\ACMS] Off:00000008 Len:00000008 Acc:1 \ACMX RegionField Rgn [\ACMS] Off:00000000 Len:00000008 Acc:1 \ACMS OpRegion [SystemIO] Len:00000002 -\OSTY Integer = 0x00000000FFFFFFFF +\OSTY Integer = 0xFFFFFFFFFFFFFFFF \P80H RegionField Rgn [\DEB2] Off:00000000 Len:00000010 Acc:2 \DEB2 OpRegion [SystemIO] Len:00000002 \VGAF Integer = 0x0000000000000001 @@ -105208,7 +105208,7 @@ aml._.term_obj end Integer = 0x0000000000000000 \MCTH Method length:0x00000047 Args:2 serialize:0 sync_level:0 \OSFL Method length:0x0000027E Args:0 serialize:0 sync_level:0 -\OSVR Integer = 0x00000000FFFFFFFF +\OSVR Integer = 0xFFFFFFFFFFFFFFFF \_PIC Method length:0x00000019 Args:1 serialize:0 sync_level:0 \PICM Integer = 0x0000000000000000 \RBAL Integer = 0x000000000000000A @@ -105824,18 +105824,18 @@ aml._.term_obj end \_SB_\BAT0\PBIX Package elements:20 Integer = 0x0000000000000000 Integer = 0x0000000000000000 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000000001 - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x00000000000019B4 Integer = 0x0000000000001086 Integer = 0x00000000000001A7 Integer = 0x0000000000000075 - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000017318 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x00000000000007D0 Integer = 0x00000000000001F4 String Len:0x00000004 value:BAT1 @@ -105844,10 +105844,10 @@ aml._.term_obj end String Len:0x00000001 value: \_SB_\BAT0\PBIF Package elements:13 Integer = 0x0000000000000001 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000000001 - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x00000000000019B4 Integer = 0x0000000000001086 Integer = 0x00000000000001A7 @@ -105858,9 +105858,9 @@ aml._.term_obj end String Len:0x00000001 value: \_SB_\BAT0\PBST Package elements:4 Integer = 0x0000000000000000 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF \_SB_\BAT0\_PCL Package elements:1 Deferred _SB_PBST \_SB_\BAT0\_HID Integer = 0x000000000A0CD041 @@ -108986,8 +108986,8 @@ aml._.term_obj end \_SB_\PCI0\GP17\VGA_\PX01 Method length:0x0000003F Args:0 serialize:0 sync_level:0 \_SB_\PCI0\GP17\VGA_\PX00 Method length:0x00000094 Args:0 serialize:0 sync_level:0 \_SB_\PCI0\GP17\VGA_\ATPX Method length:0x000000CA Args:2 serialize:1 sync_level:0 -\_SB_\PCI0\GP17\VGA_\M191 Integer = 0x00000000FFFFFFFF -\_SB_\PCI0\GP17\VGA_\M190 Integer = 0x00000000FFFFFFFF +\_SB_\PCI0\GP17\VGA_\M191 Integer = 0xFFFFFFFFFFFFFFFF +\_SB_\PCI0\GP17\VGA_\M190 Integer = 0xFFFFFFFFFFFFFFFF \_SB_\PCI0\GP17\VGA_\M189 Buffer Len:0x00000100 \_SB_\PCI0\GP17\VGA_\XTRM Method length:0x000000A9 Args:2 serialize:1 sync_level:0 \_SB_\PCI0\GP17\VGA_\M202 Buffer Len:0x00010000 @@ -112426,7 +112426,7 @@ aml._.term_obj end \M230 Mutex sync_level:0 \M049 Method length:0x00000016 Args:2 serialize:1 sync_level:0 \M045 Method length:0x000000B7 Args:0 serialize:1 sync_level:0 -\M047 Integer = 0x00000000FFFFFFFF +\M047 Integer = 0xFFFFFFFFFFFFFFFF \M046 Integer = 0x0000000000000000 \M252 Method length:0x00000065 Args:2 serialize:1 sync_level:0 \M114 Method length:0x00000146 Args:0 serialize:1 sync_level:0 @@ -112822,7 +112822,7 @@ aml._.term_obj end \OSSP Integer = 0x0000000000000000 \LINX Integer = 0x0000000000000000 \TPOS Integer = 0x0000000000000000 -\OSTB Integer = 0x00000000FFFFFFFF +\OSTB Integer = 0xFFFFFFFFFFFFFFFF \_WAK Method length:0x00000057 Args:1 serialize:0 sync_level:0 \_PTS Method length:0x00000032 Args:1 serialize:0 sync_level:0 \_S5_ Package elements:4 @@ -112872,7 +112872,7 @@ aml._.term_obj end \ACMA RegionField Rgn [\ACMS] Off:00000008 Len:00000008 Acc:1 \ACMX RegionField Rgn [\ACMS] Off:00000000 Len:00000008 Acc:1 \ACMS OpRegion [SystemIO] Len:00000002 -\OSTY Integer = 0x00000000FFFFFFFF +\OSTY Integer = 0xFFFFFFFFFFFFFFFF \P80H RegionField Rgn [\DEB2] Off:00000000 Len:00000010 Acc:2 \DEB2 OpRegion [SystemIO] Len:00000002 \VGAF Integer = 0x0000000000000001 @@ -112897,7 +112897,7 @@ aml._.term_obj end Integer = 0x0000000000000000 \MCTH Method length:0x00000047 Args:2 serialize:0 sync_level:0 \OSFL Method length:0x0000027E Args:0 serialize:0 sync_level:0 -\OSVR Integer = 0x00000000FFFFFFFF +\OSVR Integer = 0xFFFFFFFFFFFFFFFF \_PIC Method length:0x00000019 Args:1 serialize:0 sync_level:0 \PICM Integer = 0x0000000000000000 \RBAL Integer = 0x000000000000000A @@ -113513,18 +113513,18 @@ aml._.term_obj end \_SB_\BAT0\PBIX Package elements:20 Integer = 0x0000000000000000 Integer = 0x0000000000000000 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000000001 - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x00000000000019B4 Integer = 0x0000000000001086 Integer = 0x00000000000001A7 Integer = 0x0000000000000075 - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000017318 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x00000000000007D0 Integer = 0x00000000000001F4 String Len:0x00000004 value:BAT1 @@ -113533,10 +113533,10 @@ aml._.term_obj end String Len:0x00000001 value: \_SB_\BAT0\PBIF Package elements:13 Integer = 0x0000000000000001 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000000001 - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x00000000000019B4 Integer = 0x0000000000001086 Integer = 0x00000000000001A7 @@ -113547,9 +113547,9 @@ aml._.term_obj end String Len:0x00000001 value: \_SB_\BAT0\PBST Package elements:4 Integer = 0x0000000000000000 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF \_SB_\BAT0\_PCL Package elements:1 Deferred _SB_PBST \_SB_\BAT0\_HID Integer = 0x000000000A0CD041 @@ -116675,8 +116675,8 @@ aml._.term_obj end \_SB_\PCI0\GP17\VGA_\PX01 Method length:0x0000003F Args:0 serialize:0 sync_level:0 \_SB_\PCI0\GP17\VGA_\PX00 Method length:0x00000094 Args:0 serialize:0 sync_level:0 \_SB_\PCI0\GP17\VGA_\ATPX Method length:0x000000CA Args:2 serialize:1 sync_level:0 -\_SB_\PCI0\GP17\VGA_\M191 Integer = 0x00000000FFFFFFFF -\_SB_\PCI0\GP17\VGA_\M190 Integer = 0x00000000FFFFFFFF +\_SB_\PCI0\GP17\VGA_\M191 Integer = 0xFFFFFFFFFFFFFFFF +\_SB_\PCI0\GP17\VGA_\M190 Integer = 0xFFFFFFFFFFFFFFFF \_SB_\PCI0\GP17\VGA_\M189 Buffer Len:0x00000100 \_SB_\PCI0\GP17\VGA_\XTRM Method length:0x000000A9 Args:2 serialize:1 sync_level:0 \_SB_\PCI0\GP17\VGA_\M202 Buffer Len:0x00010000 @@ -118622,7 +118622,7 @@ aml._.get_node_by_name end \M230 Mutex sync_level:0 \M049 Method length:0x00000016 Args:2 serialize:1 sync_level:0 \M045 Method length:0x000000B7 Args:0 serialize:1 sync_level:0 -\M047 Integer = 0x00000000FFFFFFFF +\M047 Integer = 0xFFFFFFFFFFFFFFFF \M046 Integer = 0x0000000000000000 \M252 Method length:0x00000065 Args:2 serialize:1 sync_level:0 \M114 Method length:0x00000146 Args:0 serialize:1 sync_level:0 @@ -119018,7 +119018,7 @@ aml._.get_node_by_name end \OSSP Integer = 0x0000000000000000 \LINX Integer = 0x0000000000000000 \TPOS Integer = 0x0000000000000000 -\OSTB Integer = 0x00000000FFFFFFFF +\OSTB Integer = 0xFFFFFFFFFFFFFFFF \_WAK Method length:0x00000057 Args:1 serialize:0 sync_level:0 \_PTS Method length:0x00000032 Args:1 serialize:0 sync_level:0 \_S5_ Package elements:4 @@ -119068,7 +119068,7 @@ aml._.get_node_by_name end \ACMA RegionField Rgn [\ACMS] Off:00000008 Len:00000008 Acc:1 \ACMX RegionField Rgn [\ACMS] Off:00000000 Len:00000008 Acc:1 \ACMS OpRegion [SystemIO] Len:00000002 -\OSTY Integer = 0x00000000FFFFFFFF +\OSTY Integer = 0xFFFFFFFFFFFFFFFF \P80H RegionField Rgn [\DEB2] Off:00000000 Len:00000010 Acc:2 \DEB2 OpRegion [SystemIO] Len:00000002 \VGAF Integer = 0x0000000000000001 @@ -119093,7 +119093,7 @@ aml._.get_node_by_name end Integer = 0x0000000000000000 \MCTH Method length:0x00000047 Args:2 serialize:0 sync_level:0 \OSFL Method length:0x0000027E Args:0 serialize:0 sync_level:0 -\OSVR Integer = 0x00000000FFFFFFFF +\OSVR Integer = 0xFFFFFFFFFFFFFFFF \_PIC Method length:0x00000019 Args:1 serialize:0 sync_level:0 \PICM Integer = 0x0000000000000000 \RBAL Integer = 0x000000000000000A @@ -119708,18 +119708,18 @@ aml._.get_node_by_name end \_SB_\BAT0\PBIX Package elements:20 Integer = 0x0000000000000000 Integer = 0x0000000000000000 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000000001 - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x00000000000019B4 Integer = 0x0000000000001086 Integer = 0x00000000000001A7 Integer = 0x0000000000000075 - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000017318 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x00000000000007D0 Integer = 0x00000000000001F4 String Len:0x00000004 value:BAT1 @@ -119728,10 +119728,10 @@ aml._.get_node_by_name end String Len:0x00000001 value: \_SB_\BAT0\PBIF Package elements:13 Integer = 0x0000000000000001 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000000001 - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x00000000000019B4 Integer = 0x0000000000001086 Integer = 0x00000000000001A7 @@ -119742,9 +119742,9 @@ aml._.get_node_by_name end String Len:0x00000001 value: \_SB_\BAT0\PBST Package elements:4 Integer = 0x0000000000000000 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF \_SB_\BAT0\_PCL Package elements:1 Reference Target: \_SB_ \_SB_\BAT0\_HID Integer = 0x000000000A0CD041 @@ -122870,8 +122870,8 @@ aml._.get_node_by_name end \_SB_\PCI0\GP17\VGA_\PX01 Method length:0x0000003F Args:0 serialize:0 sync_level:0 \_SB_\PCI0\GP17\VGA_\PX00 Method length:0x00000094 Args:0 serialize:0 sync_level:0 \_SB_\PCI0\GP17\VGA_\ATPX Method length:0x000000CA Args:2 serialize:1 sync_level:0 -\_SB_\PCI0\GP17\VGA_\M191 Integer = 0x00000000FFFFFFFF -\_SB_\PCI0\GP17\VGA_\M190 Integer = 0x00000000FFFFFFFF +\_SB_\PCI0\GP17\VGA_\M191 Integer = 0xFFFFFFFFFFFFFFFF +\_SB_\PCI0\GP17\VGA_\M190 Integer = 0xFFFFFFFFFFFFFFFF \_SB_\PCI0\GP17\VGA_\M189 Buffer Len:0x00000100 \_SB_\PCI0\GP17\VGA_\XTRM Method length:0x000000A9 Args:2 serialize:1 sync_level:0 \_SB_\PCI0\GP17\VGA_\M202 Buffer Len:0x00010000 diff --git a/test/027_#acpi_m001.ref.log b/test/027_#acpi_m001.ref.log index c229051..d6cc166 100644 --- a/test/027_#acpi_m001.ref.log +++ b/test/027_#acpi_m001.ref.log @@ -44590,7 +44590,7 @@ aml._.term_obj end \OSSP Integer = 0x0000000000000000 \LINX Integer = 0x0000000000000000 \TPOS Integer = 0x0000000000000000 -\OSTB Integer = 0x00000000FFFFFFFF +\OSTB Integer = 0xFFFFFFFFFFFFFFFF \HTTS Integer = 0x0000000000000000 \MYOS Integer = 0x0000000000000000 \WNOS Integer = 0x0000000000000000 @@ -44834,8 +44834,8 @@ _CRT \_SB_\BAT1\ERRC Integer = 0x0000000000000000 \_SB_\BAT1\PBST Package elements:4 Integer = 0x0000000000000000 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000002710 \_SB_\BAT1\PBIF Package elements:13 Integer = 0x0000000000000001 @@ -47025,8 +47025,8 @@ _CRT \_SB_\PCI0\VGA_\CNT2 Buffer Len:0x00000005 \_SB_\PCI0\VGA_\CNT1 Buffer Len:0x00000005 \_SB_\PCI0\VGA_\CNT0 Buffer Len:0x00000005 -\_SB_\PCI0\VGA_\HSID Integer = 0x00000000FFFFFFFF -\_SB_\PCI0\VGA_\DSID Integer = 0x00000000FFFFFFFF +\_SB_\PCI0\VGA_\HSID Integer = 0xFFFFFFFFFFFFFFFF +\_SB_\PCI0\VGA_\DSID Integer = 0xFFFFFFFFFFFFFFFF \_SB_\PCI0\VGA_\ATPB Buffer Len:0x00000100 \_SB_\PCI0\VGA_\XTRM Method length:0x00000099 Args:2 serialize:1 sync_level:0 \_SB_\PCI0\VGA_\TVGA Buffer Len:0x00000004 @@ -52167,7 +52167,7 @@ aml._.term_obj end \OSSP Integer = 0x0000000000000000 \LINX Integer = 0x0000000000000000 \TPOS Integer = 0x0000000000000000 -\OSTB Integer = 0x00000000FFFFFFFF +\OSTB Integer = 0xFFFFFFFFFFFFFFFF \HTTS Integer = 0x0000000000000000 \MYOS Integer = 0x0000000000000000 \WNOS Integer = 0x0000000000000000 @@ -52411,8 +52411,8 @@ _CRT \_SB_\BAT1\ERRC Integer = 0x0000000000000000 \_SB_\BAT1\PBST Package elements:4 Integer = 0x0000000000000000 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000002710 \_SB_\BAT1\PBIF Package elements:13 Integer = 0x0000000000000001 @@ -54602,8 +54602,8 @@ _CRT \_SB_\PCI0\VGA_\CNT2 Buffer Len:0x00000005 \_SB_\PCI0\VGA_\CNT1 Buffer Len:0x00000005 \_SB_\PCI0\VGA_\CNT0 Buffer Len:0x00000005 -\_SB_\PCI0\VGA_\HSID Integer = 0x00000000FFFFFFFF -\_SB_\PCI0\VGA_\DSID Integer = 0x00000000FFFFFFFF +\_SB_\PCI0\VGA_\HSID Integer = 0xFFFFFFFFFFFFFFFF +\_SB_\PCI0\VGA_\DSID Integer = 0xFFFFFFFFFFFFFFFF \_SB_\PCI0\VGA_\ATPB Buffer Len:0x00000100 \_SB_\PCI0\VGA_\XTRM Method length:0x00000099 Args:2 serialize:1 sync_level:0 \_SB_\PCI0\VGA_\TVGA Buffer Len:0x00000004 @@ -58914,7 +58914,7 @@ aml._.term_obj end \OSSP Integer = 0x0000000000000000 \LINX Integer = 0x0000000000000000 \TPOS Integer = 0x0000000000000000 -\OSTB Integer = 0x00000000FFFFFFFF +\OSTB Integer = 0xFFFFFFFFFFFFFFFF \HTTS Integer = 0x0000000000000000 \MYOS Integer = 0x0000000000000000 \WNOS Integer = 0x0000000000000000 @@ -59356,8 +59356,8 @@ _CRT \_SB_\BAT1\ERRC Integer = 0x0000000000000000 \_SB_\BAT1\PBST Package elements:4 Integer = 0x0000000000000000 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000002710 \_SB_\BAT1\PBIF Package elements:13 Integer = 0x0000000000000001 @@ -61547,8 +61547,8 @@ _CRT \_SB_\PCI0\VGA_\CNT2 Buffer Len:0x00000005 \_SB_\PCI0\VGA_\CNT1 Buffer Len:0x00000005 \_SB_\PCI0\VGA_\CNT0 Buffer Len:0x00000005 -\_SB_\PCI0\VGA_\HSID Integer = 0x00000000FFFFFFFF -\_SB_\PCI0\VGA_\DSID Integer = 0x00000000FFFFFFFF +\_SB_\PCI0\VGA_\HSID Integer = 0xFFFFFFFFFFFFFFFF +\_SB_\PCI0\VGA_\DSID Integer = 0xFFFFFFFFFFFFFFFF \_SB_\PCI0\VGA_\ATPB Buffer Len:0x00000100 \_SB_\PCI0\VGA_\XTRM Method length:0x00000099 Args:2 serialize:1 sync_level:0 \_SB_\PCI0\VGA_\TVGA Buffer Len:0x00000004 @@ -63103,7 +63103,7 @@ aml._.get_node_by_name end \OSSP Integer = 0x0000000000000000 \LINX Integer = 0x0000000000000000 \TPOS Integer = 0x0000000000000000 -\OSTB Integer = 0x00000000FFFFFFFF +\OSTB Integer = 0xFFFFFFFFFFFFFFFF \HTTS Integer = 0x0000000000000000 \MYOS Integer = 0x0000000000000000 \WNOS Integer = 0x0000000000000000 @@ -63541,8 +63541,8 @@ aml._.get_node_by_name end \_SB_\BAT1\ERRC Integer = 0x0000000000000000 \_SB_\BAT1\PBST Package elements:4 Integer = 0x0000000000000000 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF Integer = 0x0000000000002710 \_SB_\BAT1\PBIF Package elements:13 Integer = 0x0000000000000001 @@ -65732,8 +65732,8 @@ aml._.get_node_by_name end \_SB_\PCI0\VGA_\CNT2 Buffer Len:0x00000005 \_SB_\PCI0\VGA_\CNT1 Buffer Len:0x00000005 \_SB_\PCI0\VGA_\CNT0 Buffer Len:0x00000005 -\_SB_\PCI0\VGA_\HSID Integer = 0x00000000FFFFFFFF -\_SB_\PCI0\VGA_\DSID Integer = 0x00000000FFFFFFFF +\_SB_\PCI0\VGA_\HSID Integer = 0xFFFFFFFFFFFFFFFF +\_SB_\PCI0\VGA_\DSID Integer = 0xFFFFFFFFFFFFFFFF \_SB_\PCI0\VGA_\ATPB Buffer Len:0x00000100 \_SB_\PCI0\VGA_\XTRM Method length:0x00000099 Args:2 serialize:1 sync_level:0 \_SB_\PCI0\VGA_\TVGA Buffer Len:0x00000004 diff --git a/test/028_#acpi_m002.ref.log b/test/028_#acpi_m002.ref.log index d3b7ce8..0b3ba38 100644 --- a/test/028_#acpi_m002.ref.log +++ b/test/028_#acpi_m002.ref.log @@ -101750,16 +101750,16 @@ aml._.term_obj end \_SB_\INUM Method length:0x00000042 Args:1 serialize:0 sync_level:0 \_SB_\GNUM Method length:0x00000017 Args:1 serialize:0 sync_level:0 \_SB_\RXEV Package elements:10 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF \_SB_\GPES Package elements:10 Integer = 0x0000000000000000 Integer = 0x0000000000000000 @@ -109564,16 +109564,16 @@ aml._.term_obj end \_SB_\INUM Method length:0x00000042 Args:1 serialize:0 sync_level:0 \_SB_\GNUM Method length:0x00000017 Args:1 serialize:0 sync_level:0 \_SB_\RXEV Package elements:10 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF \_SB_\GPES Package elements:10 Integer = 0x0000000000000000 Integer = 0x0000000000000000 @@ -121633,16 +121633,16 @@ aml._.term_obj end \_SB_\INUM Method length:0x00000042 Args:1 serialize:0 sync_level:0 \_SB_\GNUM Method length:0x00000017 Args:1 serialize:0 sync_level:0 \_SB_\RXEV Package elements:10 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF \_SB_\GPES Package elements:10 Integer = 0x0000000000000000 Integer = 0x0000000000000000 @@ -145037,16 +145037,16 @@ aml._.term_obj end \_SB_\INUM Method length:0x00000042 Args:1 serialize:0 sync_level:0 \_SB_\GNUM Method length:0x00000017 Args:1 serialize:0 sync_level:0 \_SB_\RXEV Package elements:10 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF \_SB_\GPES Package elements:10 Integer = 0x0000000000000000 Integer = 0x0000000000000000 @@ -159792,16 +159792,16 @@ d \_SB_\INUM Method length:0x00000042 Args:1 serialize:0 sync_level:0 \_SB_\GNUM Method length:0x00000017 Args:1 serialize:0 sync_level:0 \_SB_\RXEV Package elements:10 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF \_SB_\GPES Package elements:10 Integer = 0x0000000000000000 Integer = 0x0000000000000000 @@ -168654,16 +168654,16 @@ d \_SB_\INUM Method length:0x00000042 Args:1 serialize:0 sync_level:0 \_SB_\GNUM Method length:0x00000017 Args:1 serialize:0 sync_level:0 \_SB_\RXEV Package elements:10 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF \_SB_\GPES Package elements:10 Integer = 0x0000000000000000 Integer = 0x0000000000000000 @@ -179716,16 +179716,16 @@ d \_SB_\INUM Method length:0x00000042 Args:1 serialize:0 sync_level:0 \_SB_\GNUM Method length:0x00000017 Args:1 serialize:0 sync_level:0 \_SB_\RXEV Package elements:10 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF \_SB_\GPES Package elements:10 Integer = 0x0000000000000000 Integer = 0x0000000000000000 @@ -190968,16 +190968,16 @@ d \_SB_\INUM Method length:0x00000042 Args:1 serialize:0 sync_level:0 \_SB_\GNUM Method length:0x00000017 Args:1 serialize:0 sync_level:0 \_SB_\RXEV Package elements:10 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF \_SB_\GPES Package elements:10 Integer = 0x0000000000000000 Integer = 0x0000000000000000 @@ -200406,16 +200406,16 @@ d \_SB_\INUM Method length:0x00000042 Args:1 serialize:0 sync_level:0 \_SB_\GNUM Method length:0x00000017 Args:1 serialize:0 sync_level:0 \_SB_\RXEV Package elements:10 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF \_SB_\GPES Package elements:10 Integer = 0x0000000000000000 Integer = 0x0000000000000000 @@ -210244,16 +210244,16 @@ d \_SB_\INUM Method length:0x00000042 Args:1 serialize:0 sync_level:0 \_SB_\GNUM Method length:0x00000017 Args:1 serialize:0 sync_level:0 \_SB_\RXEV Package elements:10 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF \_SB_\GPES Package elements:10 Integer = 0x0000000000000000 Integer = 0x0000000000000000 @@ -219414,16 +219414,16 @@ d \_SB_\INUM Method length:0x00000042 Args:1 serialize:0 sync_level:0 \_SB_\GNUM Method length:0x00000017 Args:1 serialize:0 sync_level:0 \_SB_\RXEV Package elements:10 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF \_SB_\GPES Package elements:10 Integer = 0x0000000000000000 Integer = 0x0000000000000000 @@ -230750,16 +230750,16 @@ d \_SB_\INUM Method length:0x00000042 Args:1 serialize:0 sync_level:0 \_SB_\GNUM Method length:0x00000017 Args:1 serialize:0 sync_level:0 \_SB_\RXEV Package elements:10 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF \_SB_\GPES Package elements:10 Integer = 0x0000000000000000 Integer = 0x0000000000000000 @@ -242615,16 +242615,16 @@ d \_SB_\INUM Method length:0x00000042 Args:1 serialize:0 sync_level:0 \_SB_\GNUM Method length:0x00000017 Args:1 serialize:0 sync_level:0 \_SB_\RXEV Package elements:10 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF \_SB_\GPES Package elements:10 Integer = 0x0000000000000000 Integer = 0x0000000000000000 @@ -253220,16 +253220,16 @@ aml._.get_node_by_name end \_SB_\INUM Method length:0x00000042 Args:1 serialize:0 sync_level:0 \_SB_\GNUM Method length:0x00000017 Args:1 serialize:0 sync_level:0 \_SB_\RXEV Package elements:10 - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF - Integer = 0x00000000FFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF + Integer = 0xFFFFFFFFFFFFFFFF \_SB_\GPES Package elements:10 Integer = 0x0000000000000000 Integer = 0x0000000000000000 diff --git a/test/032_#acpi_m005.ref.log b/test/032_#acpi_m005.ref.log index 0e2981b..d06a323 100644 --- a/test/032_#acpi_m005.ref.log +++ b/test/032_#acpi_m005.ref.log @@ -25486,7 +25486,7 @@ aml._.term_obj end Integer = 0x0000000000000000 \MCTH Method length:0x00000048 Args:2 serialize:0 sync_level:0 \OSFL Method length:0x000000A9 Args:0 serialize:0 sync_level:0 -\OSVR Integer = 0x00000000FFFFFFFF +\OSVR Integer = 0xFFFFFFFFFFFFFFFF \_PIC Method length:0x000000CB Args:1 serialize:0 sync_level:0 \PICM Integer = 0x0000000000000000 \RDMA Method length:0x00000009 Args:3 serialize:0 sync_level:0 @@ -27518,7 +27518,7 @@ aml._.get_node_by_name end Integer = 0x0000000000000000 \MCTH Method length:0x00000048 Args:2 serialize:0 sync_level:0 \OSFL Method length:0x000000A9 Args:0 serialize:0 sync_level:0 -\OSVR Integer = 0x00000000FFFFFFFF +\OSVR Integer = 0xFFFFFFFFFFFFFFFF \_PIC Method length:0x000000CB Args:1 serialize:0 sync_level:0 \PICM Integer = 0x0000000000000000 \RDMA Method length:0x00000009 Args:3 serialize:0 sync_level:0 diff --git a/test/036_#acpi_m007.ref.log b/test/036_#acpi_m007.ref.log index 2c90c60..fc52367 100644 --- a/test/036_#acpi_m007.ref.log +++ b/test/036_#acpi_m007.ref.log @@ -38482,7 +38482,7 @@ aml._.term_obj end Integer = 0x0000000000000000 \MCTH Method length:0x00000047 Args:2 serialize:0 sync_level:0 \OSFL Method length:0x0000009C Args:0 serialize:0 sync_level:0 -\OSVR Integer = 0x00000000FFFFFFFF +\OSVR Integer = 0xFFFFFFFFFFFFFFFF \_PIC Method length:0x00000019 Args:1 serialize:0 sync_level:0 \PICM Integer = 0x0000000000000000 \RDMA Method length:0x00000009 Args:3 serialize:0 sync_level:0 @@ -41712,7 +41712,7 @@ aml._.term_obj end Integer = 0x0000000000000000 \MCTH Method length:0x00000047 Args:2 serialize:0 sync_level:0 \OSFL Method length:0x0000009C Args:0 serialize:0 sync_level:0 -\OSVR Integer = 0x00000000FFFFFFFF +\OSVR Integer = 0xFFFFFFFFFFFFFFFF \_PIC Method length:0x00000019 Args:1 serialize:0 sync_level:0 \PICM Integer = 0x0000000000000000 \RDMA Method length:0x00000009 Args:3 serialize:0 sync_level:0 @@ -45641,7 +45641,7 @@ aml._.get_node_by_name end Integer = 0x0000000000000000 \MCTH Method length:0x00000047 Args:2 serialize:0 sync_level:0 \OSFL Method length:0x0000009C Args:0 serialize:0 sync_level:0 -\OSVR Integer = 0x00000000FFFFFFFF +\OSVR Integer = 0xFFFFFFFFFFFFFFFF \_PIC Method length:0x00000019 Args:1 serialize:0 sync_level:0 \PICM Integer = 0x0000000000000000 \RDMA Method length:0x00000009 Args:3 serialize:0 sync_level:0 diff --git a/umka.asm b/umka.asm index 5c59b8f..c048b62 100644 --- a/umka.asm +++ b/umka.asm @@ -129,7 +129,7 @@ TASK_COUNT equ __pew19 SLOT_BASE equ __pew20 sys_proc equ __pew21 VGABasePtr equ __pew22 -;HEAP_BASE equ __pew01 +HEAP_BASE equ __pew23 ;macro OS_BASE [x] { ; OS_BASE equ os_base ;} @@ -139,14 +139,12 @@ restore CURRENT_TASK restore TASK_BASE,TASK_DATA,TASK_EVENT,CDDataBuf,idts,WIN_STACK,WIN_POS restore FDD_BUFF,WIN_TEMP_XY,KEY_COUNT,KEY_BUFF,BTN_COUNT,BTN_BUFF,BTN_ADDR restore MEM_AMOUNT,SYS_SHUTDOWN,SLOT_BASE,sys_proc,VGABasePtr -;restore HEAP_BASE +restore HEAP_BASE restore TASK_COUNT purge BOOT_LO,BOOT LFB_BASE = lfb_base -HEAP_BASE = os_base + 0x00800000 - macro save_ring3_context { pushad } @@ -183,18 +181,7 @@ macro call target { } do_change_task equ hjk irq0 equ jhg -macro mov r, v { - if r eq [CURRENT_TASK] & v eq bh - push ebx - sub ebx, SLOT_BASE - mov [CURRENT_TASK], bh - pop ebx - else - mov r, v - end if -} include 'core/sched.inc' -purge mov purge call restore irq0 include 'core/syscall.inc' @@ -277,7 +264,31 @@ proc kos_time_to_epoch c uses ebx esi edi ebp, _time ret endp +proc umka._.check_alignment + mov eax, SLOT_BASE + and eax, 0xffff ; 65k + jz @f + neg eax + add eax, 0x10000 + DEBUGF 4, "SLOT_BASE must be aligned on 0x10000: 0x%x, add 0x%x\n", \ + SLOT_BASE, eax + int3 +@@: + mov eax, HEAP_BASE + and eax, 0xfff ; page + jz @f + neg eax + add eax, 0x1000 + DEBUGF 4, "HEAP_BASE must be aligned on 0x1000: 0x%x\n, add 0x%x", \ + HEAP_BASE, eax + int3 +@@: + ret +endp + proc umka_init c uses ebx esi edi ebp + call umka._.check_alignment + mov edi, endofcode mov ecx, uglobals_size xor eax, eax @@ -330,11 +341,6 @@ proc umka_init c uses ebx esi edi ebp add eax, PROC.thr_list list_init eax -; xor eax, eax -; mov edi, lfb_base -; mov ecx, MAX_SCREEN_WIDTH*MAX_SCREEN_HEIGHT -; rep stosd - mov [BOOT.bpp], 32 mov [BOOT.x_res], UMKA_DISPLAY_WIDTH mov [BOOT.y_res], UMKA_DISPLAY_HEIGHT @@ -691,12 +697,12 @@ include 'kernel.asm' purge lea,add,org,mov restore lea,add,org,mov -purge sys_msg_board,HEAP_BASE,__pew8 +purge sys_msg_board,__pew8 coverage_end: - -section '.data' writeable align 4096 +; fasm doesn't align on 65536, but ld script does +section '.data.aligned65k' writeable align 65536 public umka_tool umka_tool dd ? fpu_owner dd ? @@ -742,18 +748,18 @@ BTN_ADDR dd ? MEM_AMOUNT rd 0x1d SYS_SHUTDOWN db ? sys_proc rd 0x800 +rb 0x8e02 ; align SLOT_BASE on 0x10000 SLOT_BASE: rd 0x8000 VGABasePtr rb 640*480 -UPPER_KERNEL_PAGES = os_base + 0x00400000 -;HEAP_BASE rb UMKA_MEMORY_BYTES - (HEAP_BASE-os_base+4096*sizeof.MEM_BLOCK) - rb 0x1000000 +;rb 0x582 ; align HEAP_BASE on page boundary +HEAP_BASE rb UMKA_MEMORY_BYTES - (HEAP_BASE-os_base+4096*sizeof.MEM_BLOCK) +lfb_base rd MAX_SCREEN_WIDTH*MAX_SCREEN_HEIGHT + BOOT boot_data virtual at BOOT BOOT_LO boot_data end virtual align 4096 -lfb_base rd MAX_SCREEN_WIDTH*MAX_SCREEN_HEIGHT -align 4096 cur_dir: .encoding rb 1 .path rb maxPathLength diff --git a/umka.ld b/umka.ld new file mode 100644 index 0000000..20ff562 --- /dev/null +++ b/umka.ld @@ -0,0 +1,9 @@ +SECTIONS +{ + . = ALIGN(65536); + .data.aligned : + { + *(SORT_BY_NAME(.data.align*)) + } +} +INSERT AFTER .data;