[Libunwind-devel] [PATCH 15/27] MIPS: implement dwarf_to_unw_regnum() macro without table

[Tommi Rantala]

---
 include/tdep-mips/dwarf-config.h |    4 ++--
 src/mips/Gglobal.c               |    9 ---------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/include/tdep-mips/dwarf-config.h b/include/tdep-mips/dwarf-config.h
index 250746f..0dbdc5a 100644
--- a/include/tdep-mips/dwarf-config.h
+++ b/include/tdep-mips/dwarf-config.h
@@ -1,5 +1,6 @@
 /* libunwind - a platform-independent unwind library
    Copyright (C) 2008 CodeSourcery
+   Copyright (C) 2012 Tommi Rantala <address@hidden>
 
 This file is part of libunwind.
 
@@ -29,8 +30,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
SOFTWARE.  */
    explicitly defined.  */
 #define DWARF_NUM_PRESERVED_REGS       188
 
-/* FIXME: Probably unnecessary on MIPS.  See mips/Gglobal.c.  */
-#define DWARF_REGNUM_MAP_LENGTH                32
+#define dwarf_to_unw_regnum(reg) (((reg) < 32) ? (reg) : 0)
 
 /* Return TRUE if the ADDR_SPACE uses big-endian byte-order.  */
 #define dwarf_is_big_endian(addr_space)        ((addr_space)->big_endian)
diff --git a/src/mips/Gglobal.c b/src/mips/Gglobal.c
index 1aa77ea..a0386f6 100644
--- a/src/mips/Gglobal.c
+++ b/src/mips/Gglobal.c
@@ -28,15 +28,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
SOFTWARE.  */
 HIDDEN pthread_mutex_t mips_lock = PTHREAD_MUTEX_INITIALIZER;
 HIDDEN int tdep_needs_initialization = 1;
 
-/* FIXME: I'm pretty sure we don't need this at all for MIPS, but "generic"
-   code (include/dwarf_i.h) seems to expect it to be here at present.  */
-
-HIDDEN uint8_t dwarf_to_unw_regnum_map[] =
-  {
-    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-    16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
-  };
-
 HIDDEN void
 tdep_init (void)
 {
-- 
1.7.9.5