[Libunwind-devel] [PATCH 03/19] HPPA: fix common_init() bitrot

[Tommi Rantala]

Fix bitrot in HPPA common_init(). This has only been compile tested.

hppa/init.h: In function 'common_init':
hppa/init.h:33: error: 'struct cursor' has no member named 'ip_loc'
hppa/init.h:33: warning: implicit declaration of function 'HPPA_REG_LOC'
hppa/init.h:34: error: 'struct cursor' has no member named 'sp_loc'
hppa/init.h:36: warning: implicit declaration of function 'hppa_get'
hppa/init.h:36: error: 'struct cursor' has no member named 'ip_loc'
hppa/init.h:36: error: 'struct cursor' has no member named 'ip'
hppa/init.h:40: error: 'struct cursor' has no member named 'sp'
---
 src/hppa/init.h |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/hppa/init.h b/src/hppa/init.h
index 6fabb15..f51e3b4 100644
--- a/src/hppa/init.h
+++ b/src/hppa/init.h
@@ -30,14 +30,14 @@ common_init (struct cursor *c, unsigned use_prev_instr)
 {
   int ret;
 
-  c->ip_loc = HPPA_REG_LOC (c, UNW_HPPA_IP);
-  c->sp_loc = HPPA_REG_LOC (c, UNW_HPPA_SP);
+  c->dwarf.loc[UNW_HPPA_IP] = DWARF_REG_LOC (&c->dwarf, UNW_HPPA_IP);
+  c->dwarf.loc[UNW_HPPA_SP] = DWARF_REG_LOC (&c->dwarf, UNW_HPPA_SP);
 
-  ret = hppa_get (c, c->ip_loc, &c->ip);
+  ret = dwarf_get (&c->dwarf, c->dwarf.loc[UNW_HPPA_IP], &c->dwarf.ip);
   if (ret < 0)
     return ret;
 
-  ret = hppa_get (c, HPPA_REG_LOC (c, UNW_HPPA_SP), &c->sp);
+  ret = dwarf_get (&c->dwarf, c->dwarf.loc[UNW_HPPA_SP], &c->dwarf.cfa);
   if (ret < 0)
     return ret;
 
-- 
1.7.9.5