CVS commit: src/sys/lib/libunwind

[Joerg Sonnenberger]

Module Name:    src
Committed By:   joerg
Date:           Tue Mar 11 23:57:42 UTC 2014

Modified Files:
        src/sys/lib/libunwind: DwarfInstructions.hpp Registers.hpp

Log Message:
Rename IP_PSEUDO_REG to RETURN_REG. Fix PPC value. Sort.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/lib/libunwind/DwarfInstructions.hpp \
    src/sys/lib/libunwind/Registers.hpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/lib/libunwind/DwarfInstructions.hpp
diff -u src/sys/lib/libunwind/DwarfInstructions.hpp:1.2 src/sys/lib/libunwind/DwarfInstructions.hpp:1.3
--- src/sys/lib/libunwind/DwarfInstructions.hpp:1.2	Tue Mar 11 23:55:11 2014
+++ src/sys/lib/libunwind/DwarfInstructions.hpp	Tue Mar 11 23:57:42 2014
@@ -49,7 +49,7 @@ private:
 
   static int lastRestoreReg(const R &) { return R::LAST_RESTORE_REG; }
   static bool isReturnAddressRegister(int regno, const R &) {
-    return regno == R::IP_PSEUDO_REG;
+    return regno == R::RETURN_REG;
   }
 
   static pint_t getCFA(A &addressSpace,
Index: src/sys/lib/libunwind/Registers.hpp
diff -u src/sys/lib/libunwind/Registers.hpp:1.2 src/sys/lib/libunwind/Registers.hpp:1.3
--- src/sys/lib/libunwind/Registers.hpp:1.2	Wed Jan 29 06:59:53 2014
+++ src/sys/lib/libunwind/Registers.hpp	Tue Mar 11 23:57:42 2014
@@ -32,9 +32,9 @@ enum {
 class Registers_x86 {
 public:
   enum {
-    LAST_RESTORE_REG = REGNO_X86_EIP,
-    IP_PSEUDO_REG = REGNO_X86_EIP,
     LAST_REGISTER = REGNO_X86_EIP,
+    LAST_RESTORE_REG = REGNO_X86_EIP,
+    RETURN_REG = REGNO_X86_EIP,
   };
 
   __dso_hidden Registers_x86();
@@ -97,9 +97,9 @@ enum {
 class Registers_x86_64 {
 public:
   enum {
-    LAST_RESTORE_REG = REGNO_X86_64_RIP,
-    IP_PSEUDO_REG = REGNO_X86_64_RIP,
     LAST_REGISTER = REGNO_X86_64_RIP,
+    LAST_RESTORE_REG = REGNO_X86_64_RIP,
+    RETURN_REG = REGNO_X86_64_RIP,
   };
 
   __dso_hidden Registers_x86_64();
@@ -166,9 +166,9 @@ enum {
 class Registers_ppc32 {
 public:
   enum {
-    LAST_RESTORE_REG = REGNO_PPC32_V31,
-    IP_PSEUDO_REG = REGNO_PPC32_SRR0,
     LAST_REGISTER = REGNO_PPC32_V31,
+    LAST_RESTORE_REG = REGNO_PPC32_V31,
+    RETURN_REG = REGNO_PPC32_LR,
   };
 
   __dso_hidden Registers_ppc32();
@@ -246,9 +246,9 @@ enum {
 class Registers_arm32 {
 public:
   enum {
-    LAST_RESTORE_REG = REGNO_ARM32_SPSR,
-    IP_PSEUDO_REG = REGNO_ARM32_SPSR,
     LAST_REGISTER = REGNO_ARM32_D31,
+    LAST_RESTORE_REG = REGNO_ARM32_SPSR,
+    RETURN_REG = REGNO_ARM32_SPSR,
   };
 
   __dso_hidden Registers_arm32();