6 files changed, 421 insertions, 202 deletions
diff --git a/test_code/.gen_symbol_offsets.sh.swp b/test_code/.gen_symbol_offsets.sh.swp
deleted file mode 100644
index 0684b31..0000000
--- a/test_code/.gen_symbol_offsets.sh.swp
+++ /dev/null
diff --git a/test_code/OVMF_VARS.fd b/test_code/OVMF_VARS.fd
index a0cc72e..5a5971c 100644
--- a/test_code/OVMF_VARS.fd
+++ b/test_code/OVMF_VARS.fd
diff --git a/test_code/debug.log b/test_code/debug.log
index ec78a23..e5de62f 100644
--- a/test_code/debug.log
+++ b/test_code/debug.log
@@ -30,7 +30,7 @@ FW CFG Revision: 0x3
 QemuFwCfg interface (DMA) is supported.
 Platform PEIM Loaded
 CMOS:
-00: 08 00 00 00 15 00 02 17 01 22 26 02 00 80 00 00
+00: 30 00 54 00 13 00 02 28 02 22 26 02 10 80 00 00
 10: 00 00 F0 00 06 80 02 FF FF 2F 00 00 04 10 FF FF
 20: C8 00 04 3F 00 00 00 00 00 00 00 00 00 00 00 00
 30: FF FF 20 00 00 07 00 20 30 00 00 00 00 12 00 00
@@ -642,10 +642,10 @@ ProtectUefiImageCommon - 0x70B57C0
 InstallProtocolInterface: 9BBE29E9-FDA1-41EC-AD52-452213742D2E 702C190
 InstallProtocolInterface: 4311EDC0-6054-46D4-9E40-893EA952FCCC 702C1A8
 Loading driver 4110465D-5FF3-4F4B-B580-24ED0D06747A
-InstallProtocolInterface: 5B1B31A1-9562-11D2-8E3F-00A0C969723B 7084140
+InstallProtocolInterface: 5B1B31A1-9562-11D2-8E3F-00A0C969723B 70840C0
 Loading driver at 0x00007074000 EntryPoint=0x000070756D6 SmbiosPlatformDxe.efi
-InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 70B5198
-ProtectUefiImageCommon - 0x7084140
+InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 7084998
+ProtectUefiImageCommon - 0x70840C0
   - 0x0000000007074000 - 0x0000000000002DC0
 Select Item: 0x0
 FW CFG Signature: 0x554D4551
@@ -667,7 +667,7 @@ SmbiosAdd: Smbios type 0 with size 0x4A is added to 32-bit table
 Loading driver D9DCC5DF-4007-435E-9098-8970935504B2
 InstallProtocolInterface: 5B1B31A1-9562-11D2-8E3F-00A0C969723B 70811C0
 Loading driver at 0x0000705F000 EntryPoint=0x0000706197E PlatformDxe.efi
-InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 7084618
+InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 7084598
 ProtectUefiImageCommon - 0x70811C0
   - 0x000000000705F000 - 0x0000000000004900
 InstallProtocolInterface: 09576E91-6D3F-11D2-8E39-00A0C969723B 7063740
@@ -1082,7 +1082,7 @@ InstallProtocolInterface: 7671D9D0-53DB-4173-AA69-2327F21F0BC7 6CAD590
 Loading driver A92CDB4B-82F1-4E0B-A516-8A655D371524
 InstallProtocolInterface: 5B1B31A1-9562-11D2-8E3F-00A0C969723B 6DA9640
 Loading driver at 0x00006CFB000 EntryPoint=0x00006CFED4A VirtioNetDxe.efi
-InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 6DA9C18
+InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 6DA9B98
 ProtectUefiImageCommon - 0x6DA9640
   - 0x0000000006CFB000 - 0x0000000000005680
 InstallProtocolInterface: 18A031AB-B443-4D1A-A5C0-0C09261E9F71 6D00540
@@ -1091,7 +1091,7 @@ InstallProtocolInterface: 6A7A5CFF-E8D9-4F70-BADA-75AB3025CE14 6D004F0
 Loading driver 2FB92EFA-2EE0-4BAE-9EB6-7464125E1EF7
 InstallProtocolInterface: 5B1B31A1-9562-11D2-8E3F-00A0C969723B 6D7AD40
 Loading driver at 0x00006CC3000 EntryPoint=0x00006CC85C9 UhciDxe.efi
-InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 6D7A518
+InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 6D7A598
 ProtectUefiImageCommon - 0x6D7AD40
   - 0x0000000006CC3000 - 0x0000000000007240
 InstallProtocolInterface: 18A031AB-B443-4D1A-A5C0-0C09261E9F71 6CCA0A0
@@ -1100,17 +1100,17 @@ InstallProtocolInterface: 6A7A5CFF-E8D9-4F70-BADA-75AB3025CE14 6CCA060
 Loading driver BDFE430E-8F2A-4DB0-9991-6F856594777E
 InstallProtocolInterface: 5B1B31A1-9562-11D2-8E3F-00A0C969723B 6D7A040
 Loading driver at 0x00006CBA000 EntryPoint=0x00006CC0643 EhciDxe.efi
-InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 6D7CD18
+InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 6D7CF98
 ProtectUefiImageCommon - 0x6D7A040
   - 0x0000000006CBA000 - 0x0000000000008B00
 InstallProtocolInterface: 18A031AB-B443-4D1A-A5C0-0C09261E9F71 6CC2960
 InstallProtocolInterface: 107A772C-D5E1-11D4-9A46-0090273FC14D 6CC2940
 InstallProtocolInterface: 6A7A5CFF-E8D9-4F70-BADA-75AB3025CE14 6CC2920
 Loading driver B7F50E91-A759-412C-ADE4-DCD03E7F7C28
-InstallProtocolInterface: 5B1B31A1-9562-11D2-8E3F-00A0C969723B 6D7C2C0
+InstallProtocolInterface: 5B1B31A1-9562-11D2-8E3F-00A0C969723B 6D7CB40
 Loading driver at 0x00006C73000 EntryPoint=0x00006C7D111 XhciDxe.efi
-InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 6D7CC98
-ProtectUefiImageCommon - 0x6D7C2C0
+InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 6D7C818
+ProtectUefiImageCommon - 0x6D7CB40
   - 0x0000000006C73000 - 0x000000000000D3C0
 InstallProtocolInterface: 18A031AB-B443-4D1A-A5C0-0C09261E9F71 6C80220
 InstallProtocolInterface: 107A772C-D5E1-11D4-9A46-0090273FC14D 6C80200
@@ -1118,7 +1118,7 @@ InstallProtocolInterface: 6A7A5CFF-E8D9-4F70-BADA-75AB3025CE14 6C801E0
 Loading driver 240612B7-A063-11D4-9A3A-0090273FC14D
 InstallProtocolInterface: 5B1B31A1-9562-11D2-8E3F-00A0C969723B 6D7B040
 Loading driver at 0x00006C85000 EntryPoint=0x00006C8BAD1 UsbBusDxe.efi
-InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 6D7BB98
+InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 6D7BC18
 ProtectUefiImageCommon - 0x6D7B040
   - 0x0000000006C85000 - 0x0000000000009700
 InstallProtocolInterface: 18A031AB-B443-4D1A-A5C0-0C09261E9F71 6C8E540
@@ -1127,41 +1127,41 @@ InstallProtocolInterface: 6A7A5CFF-E8D9-4F70-BADA-75AB3025CE14 6C8E4F0
 Loading driver 2D2E62CF-9ECF-43B7-8219-94E7FC713DFE
 InstallProtocolInterface: 5B1B31A1-9562-11D2-8E3F-00A0C969723B 6D7BD40
 Loading driver at 0x00006CB3000 EntryPoint=0x00006CB741F UsbKbDxe.efi
-InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 6D7BA98
+InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 6D7BB18
 ProtectUefiImageCommon - 0x6D7BD40
   - 0x0000000006CB3000 - 0x0000000000006600
 InstallProtocolInterface: 18A031AB-B443-4D1A-A5C0-0C09261E9F71 6CB9420
 InstallProtocolInterface: 107A772C-D5E1-11D4-9A46-0090273FC14D 6CB93F0
 InstallProtocolInterface: 6A7A5CFF-E8D9-4F70-BADA-75AB3025CE14 6CB93D0
 Loading driver 9FB4B4A7-42C0-4BCD-8540-9BCC6711F83E
-InstallProtocolInterface: 5B1B31A1-9562-11D2-8E3F-00A0C969723B 6D19040
-Loading driver at 0x00006CF5000 EntryPoint=0x00006CF8DE4 UsbMassStorageDxe.efi
-InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 6D7B918
-ProtectUefiImageCommon - 0x6D19040
-  - 0x0000000006CF5000 - 0x0000000000005B40
-InstallProtocolInterface: 18A031AB-B443-4D1A-A5C0-0C09261E9F71 6CFA9E0
-InstallProtocolInterface: 107A772C-D5E1-11D4-9A46-0090273FC14D 6CFA9B0
-InstallProtocolInterface: 6A7A5CFF-E8D9-4F70-BADA-75AB3025CE14 6CFA990
+InstallProtocolInterface: 5B1B31A1-9562-11D2-8E3F-00A0C969723B 6D7B5C0
+Loading driver at 0x00006C6D000 EntryPoint=0x00006C70DE4 UsbMassStorageDxe.efi
+InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 6D79B98
+ProtectUefiImageCommon - 0x6D7B5C0
+  - 0x0000000006C6D000 - 0x0000000000005B40
+InstallProtocolInterface: 18A031AB-B443-4D1A-A5C0-0C09261E9F71 6C729E0
+InstallProtocolInterface: 107A772C-D5E1-11D4-9A46-0090273FC14D 6C729B0
+InstallProtocolInterface: 6A7A5CFF-E8D9-4F70-BADA-75AB3025CE14 6C72990
 Loading driver E3752948-B9A1-4770-90C4-DF41C38986BE
-InstallProtocolInterface: 5B1B31A1-9562-11D2-8E3F-00A0C969723B 6D19540
-Loading driver at 0x00006C65000 EntryPoint=0x00006C68D2B QemuVideoDxe.efi
-InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 6D19A18
-ProtectUefiImageCommon - 0x6D19540
-  - 0x0000000006C65000 - 0x0000000000006300
-InstallProtocolInterface: 18A031AB-B443-4D1A-A5C0-0C09261E9F71 6C6B120
-InstallProtocolInterface: 107A772C-D5E1-11D4-9A46-0090273FC14D 6C6B100
-InstallProtocolInterface: 6A7A5CFF-E8D9-4F70-BADA-75AB3025CE14 6C6B0E0
+InstallProtocolInterface: 5B1B31A1-9562-11D2-8E3F-00A0C969723B 6D79540
+Loading driver at 0x00006C66000 EntryPoint=0x00006C69D2B QemuVideoDxe.efi
+InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 6D79E18
+ProtectUefiImageCommon - 0x6D79540
+  - 0x0000000006C66000 - 0x0000000000006300
+InstallProtocolInterface: 18A031AB-B443-4D1A-A5C0-0C09261E9F71 6C6C120
+InstallProtocolInterface: 107A772C-D5E1-11D4-9A46-0090273FC14D 6C6C100
+InstallProtocolInterface: 6A7A5CFF-E8D9-4F70-BADA-75AB3025CE14 6C6C0E0
 Loading driver D6099B94-CD97-4CC5-8714-7F6312701A8A
-InstallProtocolInterface: 5B1B31A1-9562-11D2-8E3F-00A0C969723B 6D197C0
-Loading driver at 0x00006C5F000 EntryPoint=0x00006C62FF6 VirtioGpuDxe.efi
-InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 6D79C18
-ProtectUefiImageCommon - 0x6D197C0
-  - 0x0000000006C5F000 - 0x0000000000005C00
-InstallProtocolInterface: 18A031AB-B443-4D1A-A5C0-0C09261E9F71 6C64AA0
-InstallProtocolInterface: 6A7A5CFF-E8D9-4F70-BADA-75AB3025CE14 6C64A80
+InstallProtocolInterface: 5B1B31A1-9562-11D2-8E3F-00A0C969723B 6D797C0
+Loading driver at 0x00006C60000 EntryPoint=0x00006C63FF6 VirtioGpuDxe.efi
+InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 6D78B98
+ProtectUefiImageCommon - 0x6D797C0
+  - 0x0000000006C60000 - 0x0000000000005C00
+InstallProtocolInterface: 18A031AB-B443-4D1A-A5C0-0C09261E9F71 6C65AA0
+InstallProtocolInterface: 6A7A5CFF-E8D9-4F70-BADA-75AB3025CE14 6C65A80
 [Bds] Entry...
 [BdsDxe] Locate Variable Policy protocol - Success
-Variable Driver Auto Update Lang, Lang:eng, PlatformLang:en Status: Success
+Variable Driver Auto Update PlatformLang, PlatformLang:en, Lang:eng Status: Success
 !!! DEPRECATED INTERFACE !!! VariableLockRequestToLock() will go away soon!
 !!! DEPRECATED INTERFACE !!! Please move to use Variable Policy!
 !!! DEPRECATED INTERFACE !!! Variable: 8BE4DF61-93CA-11D2-AA0D-00E098032B8C PlatformRecovery0000
@@ -1209,14 +1209,14 @@ PciBus: Resource Map for Root Bridge PciRoot(0x0)
 Type =   Io16; Base = 0xC000;	Length = 0x1000;	Alignment = 0xFFF
    Base = 0xC000;	Length = 0x10;	Alignment = 0xF;	Owner = PCI [00|01|01:20]
 
-InstallProtocolInterface: 09576E91-6D3F-11D2-8E39-00A0C969723B 6D78C98
-InstallProtocolInterface: 4CF5B200-68B8-4CA5-9EEC-B23E3F50029A 6D786A8
-InstallProtocolInterface: 09576E91-6D3F-11D2-8E39-00A0C969723B 6D77E98
-InstallProtocolInterface: 4CF5B200-68B8-4CA5-9EEC-B23E3F50029A 6D77028
-InstallProtocolInterface: 09576E91-6D3F-11D2-8E39-00A0C969723B 6D77F18
-InstallProtocolInterface: 4CF5B200-68B8-4CA5-9EEC-B23E3F50029A 6D77428
-InstallProtocolInterface: 09576E91-6D3F-11D2-8E39-00A0C969723B 6D77F98
-InstallProtocolInterface: 4CF5B200-68B8-4CA5-9EEC-B23E3F50029A 6D77828
+InstallProtocolInterface: 09576E91-6D3F-11D2-8E39-00A0C969723B 6D78898
+InstallProtocolInterface: 4CF5B200-68B8-4CA5-9EEC-B23E3F50029A 6D776A8
+InstallProtocolInterface: 09576E91-6D3F-11D2-8E39-00A0C969723B 6D78918
+InstallProtocolInterface: 4CF5B200-68B8-4CA5-9EEC-B23E3F50029A 6D76028
+InstallProtocolInterface: 09576E91-6D3F-11D2-8E39-00A0C969723B 6D76E98
+InstallProtocolInterface: 4CF5B200-68B8-4CA5-9EEC-B23E3F50029A 6D76428
+InstallProtocolInterface: 09576E91-6D3F-11D2-8E39-00A0C969723B 6D76F18
+InstallProtocolInterface: 4CF5B200-68B8-4CA5-9EEC-B23E3F50029A 6D76828
 InstallProtocolInterface: 30CFE3E7-3DE1-4586-BE20-DEABA1B3B793 0
 OnRootBridgesConnected: root bridges have been connected, installing ACPI tables
 Select Item: 0x19
@@ -1247,21 +1247,21 @@ Select Item: 0xE
 [Bds]RegisterKeyNotify: 000C/0000 80000000/00 Success
 [Bds]RegisterKeyNotify: 0017/0000 80000000/00 Success
 [Bds]RegisterKeyNotify: 0000/000D 80000000/00 Success
-InstallProtocolInterface: 864E1CA8-85EB-4D63-9DCC-6E0FC90FFD55 6CF4B98
-InstallProtocolInterface: 09576E91-6D3F-11D2-8E39-00A0C969723B 6D75018
-InstallProtocolInterface: 215FDD18-BD50-4FEB-890B-58CA0B4739E9 71402B8
-InstallProtocolInterface: 09576E91-6D3F-11D2-8E39-00A0C969723B 6D75998
-InstallProtocolInterface: 215FDD18-BD50-4FEB-890B-58CA0B4739E9 6D75C38
-InstallProtocolInterface: 09576E91-6D3F-11D2-8E39-00A0C969723B 6D75798
-InstallProtocolInterface: 215FDD18-BD50-4FEB-890B-58CA0B4739E9 6D75338
+InstallProtocolInterface: 864E1CA8-85EB-4D63-9DCC-6E0FC90FFD55 714D598
+InstallProtocolInterface: 09576E91-6D3F-11D2-8E39-00A0C969723B 6D74A18
+InstallProtocolInterface: 215FDD18-BD50-4FEB-890B-58CA0B4739E9 6D749B8
+InstallProtocolInterface: 09576E91-6D3F-11D2-8E39-00A0C969723B 6D19298
+InstallProtocolInterface: 215FDD18-BD50-4FEB-890B-58CA0B4739E9 6D19E38
+InstallProtocolInterface: 09576E91-6D3F-11D2-8E39-00A0C969723B 6D19B18
+InstallProtocolInterface: 215FDD18-BD50-4FEB-890B-58CA0B4739E9 6D19A38
 ClockRate = 1843200
 Divisor   = 1
 BaudRate/Actual (115200/115200) = 100%
 ClockRate = 1843200
 Divisor   = 1
 BaudRate/Actual (115200/115200) = 100%
-InstallProtocolInterface: 09576E91-6D3F-11D2-8E39-00A0C969723B 6D75F18
-InstallProtocolInterface: BB25CF6F-F1D4-11D2-9A0C-0090273FC1FD 6D74028
+InstallProtocolInterface: 09576E91-6D3F-11D2-8E39-00A0C969723B 6D19218
+InstallProtocolInterface: BB25CF6F-F1D4-11D2-9A0C-0090273FC1FD 6D190A8
 PciSioSerial: Create SIO child serial device - Success
 ClockRate = 1843200
 Divisor   = 1
@@ -1272,10 +1272,10 @@ Terminal - Mode 2, Column = 100, Row = 31
 ClockRate = 1843200
 Divisor   = 1
 BaudRate/Actual (115200/115200) = 100%
-InstallProtocolInterface: 387477C1-69C7-11D2-8E39-00A0C969723B 6CF3040
-InstallProtocolInterface: DD9E7534-7762-4698-8C14-F58517A625AA 6CF3128
-InstallProtocolInterface: 387477C2-69C7-11D2-8E39-00A0C969723B 6CF3058
-InstallProtocolInterface: 09576E91-6D3F-11D2-8E39-00A0C969723B 6CF3C18
+InstallProtocolInterface: 387477C1-69C7-11D2-8E39-00A0C969723B 6CFA7C0
+InstallProtocolInterface: DD9E7534-7762-4698-8C14-F58517A625AA 6CFA8A8
+InstallProtocolInterface: 387477C2-69C7-11D2-8E39-00A0C969723B 6CFA7D8
+InstallProtocolInterface: 09576E91-6D3F-11D2-8E39-00A0C969723B 6CF9018
 InstallProtocolInterface: D3B36F2B-D551-11D4-9A46-0090273FC14D 0
 InstallProtocolInterface: D3B36F2C-D551-11D4-9A46-0090273FC14D 0
 InstallProtocolInterface: D3B36F2D-D551-11D4-9A46-0090273FC14D 0
@@ -1283,8 +1283,8 @@ ClockRate = 1843200
 Divisor   = 1
 BaudRate/Actual (115200/115200) = 100%
 PciSioSerial: Create SIO child serial device - Device Error
-InstallProtocolInterface: 387477C1-69C7-11D2-8E39-00A0C969723B 6C83028
-InstallProtocolInterface: DD9E7534-7762-4698-8C14-F58517A625AA 6C83040
+InstallProtocolInterface: 387477C1-69C7-11D2-8E39-00A0C969723B 6CB1028
+InstallProtocolInterface: DD9E7534-7762-4698-8C14-F58517A625AA 6CB1040
 InstallProtocolInterface: D3B36F2B-D551-11D4-9A46-0090273FC14D 0
 ClockRate = 1843200
 Divisor   = 1
@@ -1305,41 +1305,41 @@ Divisor   = 1
 BaudRate/Actual (115200/115200) = 100%
 PciSioSerial: Create SIO child serial device - Device Error
 SataControllerStart START
-InstallProtocolInterface: A1E37052-80D9-4E65-A317-3E9A55C43EC9 6C81EA0
+InstallProtocolInterface: A1E37052-80D9-4E65-A317-3E9A55C43EC9 6CB0EA0
 SataControllerStart END status = Success
-==AtaAtapiPassThru Start== Controller = 6D77C98
+==AtaAtapiPassThru Start== Controller = 6D76C18
 [primary  ] channel [master] [harddisk] device
 Enabled S.M.A.R.T feature at [primary] channel [master] device!
 CalculateBestPioMode: AdvancedPioMode = 3
 IdeInitCalculateMode: PioMode = 4
 CalculateBestUdmaMode: DeviceUDmaMode = 203F
 IdeInitCalculateMode: UdmaMode = 5
-InstallProtocolInterface: 1D3DE7F0-0807-424F-AA69-11A54E19A46F 6C82340
-InstallProtocolInterface: 143B7632-B81B-4CB7-ABD3-B625A5B9BFFE 6C82390
-InstallProtocolInterface: 19DF145A-B1D4-453F-8507-38816676D7F6 6C81698
+InstallProtocolInterface: 1D3DE7F0-0807-424F-AA69-11A54E19A46F 6CF20C0
+InstallProtocolInterface: 143B7632-B81B-4CB7-ABD3-B625A5B9BFFE 6CF2110
+InstallProtocolInterface: 19DF145A-B1D4-453F-8507-38816676D7F6 6CF2698
 AtaBus - Identify Device: Port 0 PortMultiplierPort 0
-InstallProtocolInterface: 09576E91-6D3F-11D2-8E39-00A0C969723B 6C81718
-InstallProtocolInterface: 964E5B21-6459-11D2-8E39-00A0C969723B 6C817A8
-InstallProtocolInterface: A77B2472-E282-4E9F-A245-C2C0E27BBCC1 6C817D8
-InstallProtocolInterface: D432A67F-14DC-484B-B3BB-3F0291849327 6C81830
+InstallProtocolInterface: 09576E91-6D3F-11D2-8E39-00A0C969723B 6CB0B18
+InstallProtocolInterface: 964E5B21-6459-11D2-8E39-00A0C969723B 6CB0728
+InstallProtocolInterface: A77B2472-E282-4E9F-A245-C2C0E27BBCC1 6CB0758
+InstallProtocolInterface: D432A67F-14DC-484B-B3BB-3F0291849327 6CB07B0
 Found TCG support in Port 0 PortMultiplierPort 0
-InstallProtocolInterface: C88B0B6D-0DFC-49A7-9CB4-49074B4C3A78 6C81868
+InstallProtocolInterface: C88B0B6D-0DFC-49A7-9CB4-49074B4C3A78 6CB07E8
 Successfully Install Storage Security Protocol on the ATA device
-InstallProtocolInterface: 0167CCC4-D0F7-4F21-A3EF-9E64B7CDCE8B 6C6F120
-InstallProtocolInterface: CE345171-BA0B-11D2-8E4F-00A0C969723B 6C82620
-InstallProtocolInterface: 151C8EAE-7F2C-472C-9E54-9828194F6A88 6C82638
+InstallProtocolInterface: 0167CCC4-D0F7-4F21-A3EF-9E64B7CDCE8B 6C83820
+InstallProtocolInterface: CE345171-BA0B-11D2-8E4F-00A0C969723B 6C83120
+InstallProtocolInterface: 151C8EAE-7F2C-472C-9E54-9828194F6A88 6C83138
  BlockSize : 512 
  LastBlock : FBFFF 
-InstallProtocolInterface: 09576E91-6D3F-11D2-8E39-00A0C969723B 6C6ED18
-InstallProtocolInterface: 964E5B21-6459-11D2-8E39-00A0C969723B 6C6E330
-InstallProtocolInterface: A77B2472-E282-4E9F-A245-C2C0E27BBCC1 6C6E360
-InstallProtocolInterface: 8CF2F62C-BC9B-4821-808D-EC9EC421A1A0 6C6E3E8
-InstallProtocolInterface: CE345171-BA0B-11D2-8E4F-00A0C969723B 6C6F2A0
-InstallProtocolInterface: 151C8EAE-7F2C-472C-9E54-9828194F6A88 6C6F2B8
+InstallProtocolInterface: 09576E91-6D3F-11D2-8E39-00A0C969723B 6C82098
+InstallProtocolInterface: 964E5B21-6459-11D2-8E39-00A0C969723B 6C82830
+InstallProtocolInterface: A77B2472-E282-4E9F-A245-C2C0E27BBCC1 6C82860
+InstallProtocolInterface: 8CF2F62C-BC9B-4821-808D-EC9EC421A1A0 6C828E8
+InstallProtocolInterface: CE345171-BA0B-11D2-8E4F-00A0C969723B 6C833A0
+InstallProtocolInterface: 151C8EAE-7F2C-472C-9E54-9828194F6A88 6C833B8
  BlockSize : 512 
  LastBlock : FBFC0 
-InstallProtocolInterface: 964E5B22-6459-11D2-8E39-00A0C969723B 6C6C030
-Installed Fat filesystem on 6C6EC98
+InstallProtocolInterface: 964E5B22-6459-11D2-8E39-00A0C969723B 6C4F030
+Installed Fat filesystem on 6C82118
 ClockRate = 1843200
 Divisor   = 1
 BaudRate/Actual (115200/115200) = 100%
@@ -1394,32 +1394,250 @@ Memory  Previous  Current    Next
   06    00000100  000000B1  00000100
 [Bds]Booting EFI Internal Shell
 [Bds] Expand Fv(7CB8BDC9-F8EB-4F34-AAEA-3EE4AF6516A1)/FvFile(7C04A583-9E3E-4F1C-AD65-E05268D0B4D1) -> Fv(7CB8BDC9-F8EB-4F34-AAEA-3EE4AF6516A1)/FvFile(7C04A583-9E3E-4F1C-AD65-E05268D0B4D1)
-InstallProtocolInterface: 5B1B31A1-9562-11D2-8E3F-00A0C969723B 6C81440
+InstallProtocolInterface: 5B1B31A1-9562-11D2-8E3F-00A0C969723B 6CB0440
 Loading driver at 0x000064F5000 EntryPoint=0x0000654C804 Shell.efi
-InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 6C82F18
-ProtectUefiImageCommon - 0x6C81440
+InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 6CF3818
+ProtectUefiImageCommon - 0x6CB0440
   - 0x00000000064F5000 - 0x00000000000E24C0
-InstallProtocolInterface: 387477C2-69C7-11D2-8E39-00A0C969723B 66B8620
+InstallProtocolInterface: 387477C2-69C7-11D2-8E39-00A0C969723B 66B81A0
 InstallProtocolInterface: 752F3136-4E16-4FDC-A22A-E5F46812F4CA 66B7E18
 InstallProtocolInterface: 6302D008-7F9B-4F30-87AC-60C9FEF5DA4E 65710C0
 FSOpen: Open '\' Success
 FSOpen: Open '.' Success
-FSOpen: Open '\memtest_log' Success
-FSOpen: Open '\MemtestEfi.efi' Success
-FSOpen: Open '\NvVars' Success
-FSOpen: Open '\' Success
-FSOpen: Open '.' Success
 FSOpen: Open '\MemtestEfi.efi' Success
 FSOpen: Open '\MemtestEfi.efi' Success
 FSOpen: Open '\MemtestEfi.efi' Success
 FSOpen: Open '\MemtestEfi.efi' Success
 [Security] 3rd party image[0] can be loaded after EndOfDxe: PciRoot(0x0)/Pci(0x1,0x1)/Ata(Primary,Master,0x0)/HD(1,MBR,0xBE1AFDFA,0x3F,0xFBFC1)/\MemtestEfi.efi.
-InstallProtocolInterface: 5B1B31A1-9562-11D2-8E3F-00A0C969723B 667F040
+InstallProtocolInterface: 5B1B31A1-9562-11D2-8E3F-00A0C969723B 66802C0
 Loading driver at 0x0000661D000 EntryPoint=0x0000662972A MemtestEfi.efi
-InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 6680D98
-ProtectUefiImageCommon - 0x667F040
+InstallProtocolInterface: BC62157E-3E33-4FEC-9920-2D3B36D750DF 6680F18
+ProtectUefiImageCommon - 0x66802C0
   - 0x000000000661D000 - 0x0000000000016F80
 InstallProtocolInterface: 752F3136-4E16-4FDC-A22A-E5F46812F4CA 7E9B6A8
 FatDiskIo: Cache Page OutBound occurred! 
 FSOpen: Open 'memtest_log' Success
 FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
+FSOpen: Open 'memtest_log' Success
diff --git a/test_code/gdbscript b/test_code/gdbscript
index 5d43a44..8316706 100644
--- a/test_code/gdbscript
+++ b/test_code/gdbscript
@@ -1,107 +1,106 @@
-add-symbol-file symbol-files/PcdPeim.debug 0x82c200
-add-symbol-file symbol-files/ReportStatusCodeRouterPei.debug 0x831380
-add-symbol-file symbol-files/StatusCodeHandlerPei.debug 0x833400
-add-symbol-file symbol-files/PlatformPei.debug 0x835380
-add-symbol-file symbol-files/PeiCore.debug 0x7ee8240
-add-symbol-file symbol-files/PcdPeim.debug 0x7ee2240
-add-symbol-file symbol-files/DxeIpl.debug 0x7edd240
-add-symbol-file symbol-files/S3Resume2Pei.debug 0x7ed9240
-add-symbol-file symbol-files/CpuMpPei.debug 0x7ecc240
-add-symbol-file symbol-files/DxeCore.debug 0x7e9c240
-add-symbol-file symbol-files/DevicePathDxe.debug 0x7595240
-add-symbol-file symbol-files/PcdDxe.debug 0x758f240
-add-symbol-file symbol-files/AmdSevDxe.debug 0x75a2240
-add-symbol-file symbol-files/FvbServicesRuntimeDxe.debug 0x7ae8000
-add-symbol-file symbol-files/ReportStatusCodeRouterRuntimeDxe.debug 0x7ae2000
-add-symbol-file symbol-files/RuntimeDxe.debug 0x7adc000
-add-symbol-file symbol-files/SecurityStubDxe.debug 0x758c240
-add-symbol-file symbol-files/EbcDxe.debug 0x7580240
-add-symbol-file symbol-files/Legacy8259.debug 0x75a1240
-add-symbol-file symbol-files/CpuIo2Dxe.debug 0x7586240
-add-symbol-file symbol-files/CpuDxe.debug 0x715c240
-add-symbol-file symbol-files/IncompatiblePciDeviceSupportDxe.debug 0x7158240
-add-symbol-file symbol-files/PciHotPlugInitDxe.debug 0x714e240
-add-symbol-file symbol-files/ResetSystemRuntimeDxe.debug 0x7ad6000
-add-symbol-file symbol-files/Metronome.debug 0x7154240
-add-symbol-file symbol-files/HiiDatabase.debug 0x7110240
-add-symbol-file symbol-files/NullMemoryTestDxe.debug 0x7148240
-add-symbol-file symbol-files/AcpiTableDxe.debug 0x7138240
-add-symbol-file symbol-files/S3SaveStateDxe.debug 0x7132240
-add-symbol-file symbol-files/DpcDxe.debug 0x7145240
-add-symbol-file symbol-files/IoMmuDxe.debug 0x710b240
-add-symbol-file symbol-files/EmuVariableFvbRuntimeDxe.debug 0x7ad0000
-add-symbol-file symbol-files/VariableRuntimeDxe.debug 0x7ac6000
-add-symbol-file symbol-files/StatusCodeHandlerRuntimeDxe.debug 0x7ac1000
-add-symbol-file symbol-files/Timer.debug 0x7141240
-add-symbol-file symbol-files/PciHostBridgeDxe.debug 0x70f7240
-add-symbol-file symbol-files/SetupBrowser.debug 0x70c3240
-add-symbol-file symbol-files/SmbiosDxe.debug 0x70f1240
-add-symbol-file symbol-files/QemuFwCfgAcpiPlatform.debug 0x70ea240
-add-symbol-file symbol-files/BootScriptExecutorDxe.debug 0x70a3240
-add-symbol-file symbol-files/tftpDynamicCommand.debug 0x70b8240
-add-symbol-file symbol-files/httpDynamicCommand.debug 0x7096240
-add-symbol-file symbol-files/LinuxInitrdDynamicShellCommand.debug 0x708e240
-add-symbol-file symbol-files/LogoDxe.debug 0x70e5240
-add-symbol-file symbol-files/QemuRamfbDxe.debug 0x70b3240
-add-symbol-file symbol-files/FaultTolerantWriteDxe.debug 0x7088240
-add-symbol-file symbol-files/PcRtc.debug 0x7abb000
-add-symbol-file symbol-files/WatchdogTimer.debug 0x70de240
-add-symbol-file symbol-files/MonotonicCounterRuntimeDxe.debug 0x7ab7000
-add-symbol-file symbol-files/CapsuleRuntimeDxe.debug 0x7ab3000
-add-symbol-file symbol-files/DriverHealthManagerDxe.debug 0x707a240
-add-symbol-file symbol-files/BdsDxe.debug 0x7042240
-add-symbol-file symbol-files/RamDiskDxe.debug 0x7064240
-add-symbol-file symbol-files/DisplayEngine.debug 0x701a240
-add-symbol-file symbol-files/SmbiosPlatformDxe.debug 0x7074240
-add-symbol-file symbol-files/PlatformDxe.debug 0x705f240
-add-symbol-file symbol-files/PciBusDxe.debug 0x700a240
-add-symbol-file symbol-files/VirtioPciDeviceDxe.debug 0x703e240
-add-symbol-file symbol-files/Virtio10.debug 0x7039240
-add-symbol-file symbol-files/VirtioBlkDxe.debug 0x7035240
-add-symbol-file symbol-files/VirtioScsiDxe.debug 0x7031240
-add-symbol-file symbol-files/VirtioRngDxe.debug 0x7006240
-add-symbol-file symbol-files/PvScsiDxe.debug 0x7002240
-add-symbol-file symbol-files/MptScsiDxe.debug 0x6dfc240
-add-symbol-file symbol-files/ConPlatformDxe.debug 0x6df2240
-add-symbol-file symbol-files/ConSplitterDxe.debug 0x6de2240
-add-symbol-file symbol-files/GraphicsConsoleDxe.debug 0x6ddc240
-add-symbol-file symbol-files/TerminalDxe.debug 0x6dd4240
-add-symbol-file symbol-files/QemuKernelLoaderFsDxe.debug 0x6dcf240
-add-symbol-file symbol-files/DiskIoDxe.debug 0x6dcf240
-add-symbol-file symbol-files/PartitionDxe.debug 0x6dc8240
-add-symbol-file symbol-files/EnglishDxe.debug 0x6def240
-add-symbol-file symbol-files/ScsiBus.debug 0x6dc3240
-add-symbol-file symbol-files/ScsiDisk.debug 0x6daf240
-add-symbol-file symbol-files/SataController.debug 0x6dbf240
-add-symbol-file symbol-files/AtaAtapiPassThruDxe.debug 0x6d97240
-add-symbol-file symbol-files/AtaBusDxe.debug 0x6d90240
-add-symbol-file symbol-files/NvmExpressDxe.debug 0x6d86240
-add-symbol-file symbol-files/SioBusDxe.debug 0x6dbb240
-add-symbol-file symbol-files/PciSioSerialDxe.debug 0x6d7f240
-add-symbol-file symbol-files/Ps2KeyboardDxe.debug 0x6da3240
-add-symbol-file symbol-files/BootGraphicsResourceTableDxe.debug 0x6dac240
-add-symbol-file symbol-files/Fat.debug 0x6d69240
-add-symbol-file symbol-files/UdfDxe.debug 0x6d62240
-add-symbol-file symbol-files/VirtioFsDxe.debug 0x6d58240
-add-symbol-file symbol-files/SnpDxe.debug 0x6d50240
-add-symbol-file symbol-files/VlanConfigDxe.debug 0x6d49240
-add-symbol-file symbol-files/MnpDxe.debug 0x6d3e240
-add-symbol-file symbol-files/ArpDxe.debug 0x6d38240
-add-symbol-file symbol-files/Dhcp4Dxe.debug 0x6d2d240
-add-symbol-file symbol-files/Ip4Dxe.debug 0x6d05240
-add-symbol-file symbol-files/Udp4Dxe.debug 0x6d24240
-add-symbol-file symbol-files/Mtftp4Dxe.debug 0x6d1a240
-add-symbol-file symbol-files/TcpDxe.debug 0x6cdf240
-add-symbol-file symbol-files/UefiPxeBcDxe.debug 0x6ccd240
-add-symbol-file symbol-files/IScsiDxe.debug 0x6c8f240
-add-symbol-file symbol-files/VirtioNetDxe.debug 0x6cfb240
-add-symbol-file symbol-files/UhciDxe.debug 0x6cc3240
-add-symbol-file symbol-files/EhciDxe.debug 0x6cba240
-add-symbol-file symbol-files/XhciDxe.debug 0x6c73240
-add-symbol-file symbol-files/UsbBusDxe.debug 0x6c85240
-add-symbol-file symbol-files/UsbKbDxe.debug 0x6cb3240
-add-symbol-file symbol-files/UsbMassStorageDxe.debug 0x6cf5240
-add-symbol-file symbol-files/QemuVideoDxe.debug 0x6c65240
-add-symbol-file symbol-files/VirtioGpuDxe.debug 0x6c5f240
-add-symbol-file symbol-files/Shell.debug 0x64f5240
-add-symbol-file symbol-files/MemtestEfi.debug 0x661d240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/PcdPeim.debug 0x82c200
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/ReportStatusCodeRouterPei.debug 0x831380
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/StatusCodeHandlerPei.debug 0x833400
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/PlatformPei.debug 0x835380
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/PeiCore.debug 0x7ee8240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/PcdPeim.debug 0x7ee2240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/DxeIpl.debug 0x7edd240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/S3Resume2Pei.debug 0x7ed9240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/CpuMpPei.debug 0x7ecc240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/DxeCore.debug 0x7e9c240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/DevicePathDxe.debug 0x7595240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/PcdDxe.debug 0x758f240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/AmdSevDxe.debug 0x75a2240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/FvbServicesRuntimeDxe.debug 0x7ae8000
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/ReportStatusCodeRouterRuntimeDxe.debug 0x7ae2000
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/RuntimeDxe.debug 0x7adc000
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/SecurityStubDxe.debug 0x758c240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/EbcDxe.debug 0x7580240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/Legacy8259.debug 0x75a1240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/CpuIo2Dxe.debug 0x7586240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/CpuDxe.debug 0x715c240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/IncompatiblePciDeviceSupportDxe.debug 0x7158240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/PciHotPlugInitDxe.debug 0x714e240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/ResetSystemRuntimeDxe.debug 0x7ad6000
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/Metronome.debug 0x7154240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/HiiDatabase.debug 0x7110240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/NullMemoryTestDxe.debug 0x7148240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/AcpiTableDxe.debug 0x7138240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/S3SaveStateDxe.debug 0x7132240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/DpcDxe.debug 0x7145240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/IoMmuDxe.debug 0x710b240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/EmuVariableFvbRuntimeDxe.debug 0x7ad0000
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/VariableRuntimeDxe.debug 0x7ac6000
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/StatusCodeHandlerRuntimeDxe.debug 0x7ac1000
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/Timer.debug 0x7141240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/PciHostBridgeDxe.debug 0x70f7240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/SetupBrowser.debug 0x70c3240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/SmbiosDxe.debug 0x70f1240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/QemuFwCfgAcpiPlatform.debug 0x70ea240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/BootScriptExecutorDxe.debug 0x70a3240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/tftpDynamicCommand.debug 0x70b8240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/httpDynamicCommand.debug 0x7096240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/LinuxInitrdDynamicShellCommand.debug 0x708e240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/LogoDxe.debug 0x70e5240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/QemuRamfbDxe.debug 0x70b3240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/FaultTolerantWriteDxe.debug 0x7088240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/PcRtc.debug 0x7abb000
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/WatchdogTimer.debug 0x70de240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/MonotonicCounterRuntimeDxe.debug 0x7ab7000
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/CapsuleRuntimeDxe.debug 0x7ab3000
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/DriverHealthManagerDxe.debug 0x707a240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/BdsDxe.debug 0x7042240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/RamDiskDxe.debug 0x7064240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/DisplayEngine.debug 0x701a240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/SmbiosPlatformDxe.debug 0x7074240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/PlatformDxe.debug 0x705f240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/PciBusDxe.debug 0x700a240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/VirtioPciDeviceDxe.debug 0x703e240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/Virtio10.debug 0x7039240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/VirtioBlkDxe.debug 0x7035240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/VirtioScsiDxe.debug 0x7031240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/VirtioRngDxe.debug 0x7006240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/PvScsiDxe.debug 0x7002240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/MptScsiDxe.debug 0x6dfc240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/ConPlatformDxe.debug 0x6df2240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/ConSplitterDxe.debug 0x6de2240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/GraphicsConsoleDxe.debug 0x6ddc240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/TerminalDxe.debug 0x6dd4240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/QemuKernelLoaderFsDxe.debug 0x6dcf240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/DiskIoDxe.debug 0x6dcf240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/PartitionDxe.debug 0x6dc8240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/EnglishDxe.debug 0x6def240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/ScsiBus.debug 0x6dc3240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/ScsiDisk.debug 0x6daf240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/SataController.debug 0x6dbf240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/AtaAtapiPassThruDxe.debug 0x6d97240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/AtaBusDxe.debug 0x6d90240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/NvmExpressDxe.debug 0x6d86240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/SioBusDxe.debug 0x6dbb240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/PciSioSerialDxe.debug 0x6d7f240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/Ps2KeyboardDxe.debug 0x6da3240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/BootGraphicsResourceTableDxe.debug 0x6dac240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/Fat.debug 0x6d69240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/UdfDxe.debug 0x6d62240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/VirtioFsDxe.debug 0x6d58240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/SnpDxe.debug 0x6d50240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/VlanConfigDxe.debug 0x6d49240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/MnpDxe.debug 0x6d3e240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/ArpDxe.debug 0x6d38240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/Dhcp4Dxe.debug 0x6d2d240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/Ip4Dxe.debug 0x6d05240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/Udp4Dxe.debug 0x6d24240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/Mtftp4Dxe.debug 0x6d1a240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/TcpDxe.debug 0x6cdf240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/UefiPxeBcDxe.debug 0x6ccd240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/IScsiDxe.debug 0x6c8f240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/VirtioNetDxe.debug 0x6cfb240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/UhciDxe.debug 0x6cc3240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/EhciDxe.debug 0x6cba240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/XhciDxe.debug 0x6c73240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/UsbBusDxe.debug 0x6c85240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/UsbKbDxe.debug 0x6cb3240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/UsbMassStorageDxe.debug 0x6c6d240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/QemuVideoDxe.debug 0x6c66240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/VirtioGpuDxe.debug 0x6c60240
+add-symbol-file /home/koenigr/Memtest/git/edk2/Build/OvmfX64/DEBUG_GCC5/X64/Shell.debug 0x64f5240
diff --git a/test_code/gen_symbol_offsets.sh b/test_code/gen_symbol_offsets.sh
index dda608c..0232c64 100644
--- a/test_code/gen_symbol_offsets.sh
+++ b/test_code/gen_symbol_offsets.sh
@@ -18,6 +18,6 @@ cat ${LOG} | grep Loading | grep -i efi | while read LINE; do
   fi
   TEXT="`python -c "print(hex(${BASE} + ${ADDR}))"`"
   SYMS="`echo ${NAME} | sed -e "s/\.efi/\.debug/g"`"
-  echo "add-symbol-file ${SYMOUT}/${SYMS} ${TEXT}"
+  echo "add-symbol-file ${BUILD}/${SYMS} ${TEXT}"
 done
 
diff --git a/test_code/run.sh b/test_code/run.sh
index 000d682..c0a4ea0 100755
--- a/test_code/run.sh
+++ b/test_code/run.sh
@@ -2,8 +2,10 @@
 
 #(cd hda-contents; rm memtest_log; echo -n -e '\x00' >> memtest_log)
 
+#OVMF=/usr/share/ovmf/OVMF.fd
+OVMF=/home/koenigr/Memtest/git/memtest86/test_code/OVMF.fd
 
-sudo kvm -bios OVMF.fd \
+sudo kvm -bios $OVMF \
 	--drive file=fat:rw:hda-contents,index=0,media=disk,format=raw \
 	--drive file=fat:rw:hdb-contents,index=1,media=disk,format=raw \
 	-net none \