From c0ab52799ca4ebd0a51363cfedd0658e6d79b842 Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Fri, 2 Nov 2012 11:32:01 -0500 Subject: sim: Include object header files in SWIG interfaces When casting objects in the generated SWIG interfaces, SWIG uses classical C-style casts ( (Foo *)bar; ). In some cases, this can degenerate into the equivalent of a reinterpret_cast (mainly if only a forward declaration of the type is available). This usually works for most compilers, but it is known to break if multiple inheritance is used anywhere in the object hierarchy. This patch introduces the cxx_header attribute to Python SimObject definitions, which should be used to specify a header to include in the SWIG interface. The header should include the declaration of the wrapped object. We currently don't enforce header the use of the header attribute, but a warning will be generated for objects that do not use it. --- src/arch/arm/ArmSystem.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/arch/arm/ArmSystem.py') diff --git a/src/arch/arm/ArmSystem.py b/src/arch/arm/ArmSystem.py index 3ca9b8573..ce363865c 100644 --- a/src/arch/arm/ArmSystem.py +++ b/src/arch/arm/ArmSystem.py @@ -48,6 +48,7 @@ class ArmMachineType(Enum): class ArmSystem(System): type = 'ArmSystem' + cxx_header = "arch/arm/system.hh" load_addr_mask = 0xffffffff # 0x35 Implementor is '5' from "M5" # 0x0 Variant @@ -62,6 +63,7 @@ class ArmSystem(System): class LinuxArmSystem(ArmSystem): type = 'LinuxArmSystem' + cxx_header = "arch/arm/linux/system.hh" load_addr_mask = 0x0fffffff machine_type = Param.ArmMachineType('RealView_PBX', "Machine id from http://www.arm.linux.org.uk/developer/machines/") -- cgit v1.2.3