From f2642e205549efefb7391de32b189e94e5503ddc Mon Sep 17 00:00:00 2001
From: Ali Saidi <Ali.Saidi@arm.com>
Date: Mon, 23 Aug 2010 11:18:39 -0500
Subject: Loader: Make the load address mask be a parameter of the system
 rather than a constant.

This allows one two different OS requirements for the same ISA to be handled.
Some OSes are compiled for a virtual address and need to be loaded into physical
memory that starts at address 0, while other bare metal tools generate
images that start at address 0.
---
 src/arch/x86/X86System.py  | 1 +
 src/arch/x86/isa_traits.hh | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/arch/x86')

diff --git a/src/arch/x86/X86System.py b/src/arch/x86/X86System.py
index 89a64504c..8b294fb86 100644
--- a/src/arch/x86/X86System.py
+++ b/src/arch/x86/X86System.py
@@ -54,6 +54,7 @@ class X86System(System):
             'intel mp spec configuration table')
     acpi_description_table_pointer = Param.X86ACPIRSDP(
             X86ACPIRSDP(), 'ACPI root description pointer structure')
+    load_addr_mask = 0xffffffffffffffff
 
 class LinuxX86System(X86System):
     type = 'LinuxX86System'
diff --git a/src/arch/x86/isa_traits.hh b/src/arch/x86/isa_traits.hh
index 423313b2a..c1036ac01 100644
--- a/src/arch/x86/isa_traits.hh
+++ b/src/arch/x86/isa_traits.hh
@@ -72,8 +72,6 @@ namespace X86ISA
 
     StaticInstPtr decodeInst(ExtMachInst);
 
-    const Addr LoadAddrMask = ULL(-1);
-
     // Memory accesses can be unaligned
     const bool HasUnalignedMemAcc = true;
 };
-- 
cgit v1.2.3