diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2003-02-20 16:48:26 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2003-02-20 16:48:26 +0000 |
| commit | 88117612b62f7f89056d1386c3e3add812fe1e8f (patch) | |
| tree | 8db23ab5e10de28c8b15e05ec0cace5bcef988ef /sys/arch/powerpc/ddb | |
| parent | 61e925c078331541cd5dba16d6b32ab040636000 (diff) | |
Fix the mask and sign extension for bl instruction which branch backwards.
When printing the address, address has already been added according to AA.
Diffstat (limited to 'sys/arch/powerpc/ddb')
| -rw-r--r-- | sys/arch/powerpc/ddb/db_disasm.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/arch/powerpc/ddb/db_disasm.c b/sys/arch/powerpc/ddb/db_disasm.c index 289a39e4273..dea2a1dc006 100644 --- a/sys/arch/powerpc/ddb/db_disasm.c +++ b/sys/arch/powerpc/ddb/db_disasm.c @@ -1,5 +1,5 @@ /* $NetBSD: db_disasm.c,v 1.8 2001/06/12 05:31:44 simonb Exp $ */ -/* $OpenBSD: db_disasm.c,v 1.4 2002/09/15 09:01:59 deraadt Exp $ */ +/* $OpenBSD: db_disasm.c,v 1.5 2003/02/20 16:48:25 drahn Exp $ */ /* * Copyright (c) 1996 Dale Rahn. All rights reserved. * @@ -579,8 +579,8 @@ disasm_process_field(u_int32_t addr, instr_t instr, char **ppfmt, char **ppoutpu u_int LI; LI = extract_field(instr, 31 - 29, 24); LI = LI << 2; - if (LI & 0x04000000) { - LI &= ~0x7ffffff; + if (LI & 0x02000000) { + LI |= ~0x03ffffff; } if ((instr & (1 << 1)) == 0) { /* CHECK AA bit */ @@ -589,14 +589,14 @@ disasm_process_field(u_int32_t addr, instr_t instr, char **ppfmt, char **ppoutpu db_find_sym_and_offset(LI, &name, &offset); if (name) { if (offset == 0) { - pstr += sprintf (pstr, "0x%x (%s)", addr + LI, + pstr += sprintf (pstr, "0x%x (%s)", LI, name); } else { - pstr += sprintf (pstr, "0x%x (%s+0x%x)", addr + LI, + pstr += sprintf (pstr, "0x%x (%s+0x%x)", LI, name, offset); } } else { - pstr += sprintf (pstr, "0x%x", addr + LI); + pstr += sprintf (pstr, "0x%x", LI); } } break; @@ -622,14 +622,14 @@ disasm_process_field(u_int32_t addr, instr_t instr, char **ppfmt, char **ppoutpu db_find_sym_and_offset(BD, &name, &offset); if (name) { if (offset == 0) { - pstr += sprintf (pstr, "0x%x (%s)", addr + BD, + pstr += sprintf (pstr, "0x%x (%s)", BD, name); } else { - pstr += sprintf (pstr, "0x%x (%s+0x%x)", addr + BD, + pstr += sprintf (pstr, "0x%x (%s+0x%x)", BD, name, offset); } } else { - pstr += sprintf (pstr, "0x%x", addr + BD); + pstr += sprintf (pstr, "0x%x", BD); } } break; |