2 files changed, 9 insertions, 10 deletions
diff --git a/src/arch/arm/ArmPMU.py b/src/arch/arm/ArmPMU.py
index 3baa39bc9..3802e49bc 100644
--- a/src/arch/arm/ArmPMU.py
+++ b/src/arch/arm/ArmPMU.py
@@ -38,7 +38,7 @@
 #          Andreas Sandberg
 
 from m5.defines import buildEnv
-from m5.SimObject import SimObject
+from m5.SimObject import *
 from m5.params import *
 from m5.params import isNullPointer
 from m5.proxy import *
@@ -48,12 +48,9 @@ class ArmPMU(SimObject):
     cxx_class = 'ArmISA::PMU'
     cxx_header = 'arch/arm/pmu.hh'
 
-    @classmethod
-    def export_methods(cls, code):
-        code('''
-      void addEventProbe(unsigned int id,
-                        SimObject *obj, const char *name);
-''')
+    cxx_exports = [
+        PyBindMethod("addEventProbe"),
+    ]
 
     # To prevent cycles in the configuration hierarchy, we don't keep
     # a list of supported events as a configuration param. Instead, we
diff --git a/src/arch/arm/ArmSystem.py b/src/arch/arm/ArmSystem.py
index 9100db09a..41f6b9d79 100644
--- a/src/arch/arm/ArmSystem.py
+++ b/src/arch/arm/ArmSystem.py
@@ -36,6 +36,7 @@
 # Authors: Ali Saidi
 
 from m5.params import *
+from m5.SimObject import *
 
 from System import System
 
@@ -98,9 +99,10 @@ class LinuxArmSystem(GenericArmSystem):
     type = 'LinuxArmSystem'
     cxx_header = "arch/arm/linux/system.hh"
 
-    @classmethod
-    def export_methods(cls, code):
-        code('''void dumpDmesg();''')
+    @cxxMethod
+    def dumpDmesg(self):
+        """Dump dmesg from the simulated kernel to standard out"""
+        pass
 
 class FreebsdArmSystem(GenericArmSystem):
     type = 'FreebsdArmSystem'