diff options
| author | bde <bde@FreeBSD.org> | 1998-07-08 10:53:58 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-07-08 10:53:58 +0000 |
| commit | c9efed72bc8dec26d2f4b9e8e0f798fd6c0b09a4 (patch) | |
| tree | 80c572fd7be896b8222146b062af0b33e4651633 /sys/amd64 | |
| parent | b5d9d2e7066642affdab55e8415242ac5619218d (diff) | |
| download | FreeBSD-src-c9efed72bc8dec26d2f4b9e8e0f798fd6c0b09a4.zip FreeBSD-src-c9efed72bc8dec26d2f4b9e8e0f798fd6c0b09a4.tar.gz | |
Use not-so-new printf formats %r and/or %z instead of %n and/or %+x.
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/db_disasm.c | 18 | ||||
| -rw-r--r-- | sys/amd64/amd64/db_trace.c | 10 |
2 files changed, 14 insertions, 14 deletions
diff --git a/sys/amd64/amd64/db_disasm.c b/sys/amd64/amd64/db_disasm.c index 2599b30..0917ba0 100644 --- a/sys/amd64/amd64/db_disasm.c +++ b/sys/amd64/amd64/db_disasm.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_disasm.c,v 1.19 1997/02/22 09:32:12 peter Exp $ + * $Id: db_disasm.c,v 1.20 1997/04/01 16:22:31 bde Exp $ */ /* @@ -1327,43 +1327,43 @@ db_disasm(loc, altfmt) case I: len = db_lengths[size]; get_value_inc(imm, loc, len, FALSE); - db_printf("$%#n", imm); + db_printf("$%#r", imm); break; case Is: len = db_lengths[size]; get_value_inc(imm, loc, len, FALSE); - db_printf("$%+#n", imm); + db_printf("$%+#r", imm); break; case Ib: get_value_inc(imm, loc, 1, FALSE); - db_printf("$%#n", imm); + db_printf("$%#r", imm); break; case Iba: get_value_inc(imm, loc, 1, FALSE); if (imm != 0x0a) - db_printf("$%#n", imm); + db_printf("$%#r", imm); break; case Ibs: get_value_inc(imm, loc, 1, TRUE); if (size == WORD) imm &= 0xFFFF; - db_printf("$%+#n", imm); + db_printf("$%+#r", imm); break; case Iw: get_value_inc(imm, loc, 2, FALSE); - db_printf("$%#n", imm); + db_printf("$%#r", imm); break; case O: len = (short_addr ? 2 : 4); get_value_inc(displ, loc, len, FALSE); if (seg) - db_printf("%s:%+#n",seg, displ); + db_printf("%s:%+#r",seg, displ); else db_printsym((db_addr_t)displ, DB_STGY_ANY); break; @@ -1397,7 +1397,7 @@ db_disasm(loc, altfmt) len = db_lengths[size]; get_value_inc(imm, loc, len, FALSE); /* offset */ get_value_inc(imm2, loc, 2, FALSE); /* segment */ - db_printf("$%#n,%#n", imm2, imm); + db_printf("$%#r,%#r", imm2, imm); break; } } diff --git a/sys/amd64/amd64/db_trace.c b/sys/amd64/amd64/db_trace.c index 74417df..c5af5bf 100644 --- a/sys/amd64/amd64/db_trace.c +++ b/sys/amd64/amd64/db_trace.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_trace.c,v 1.28 1998/06/07 17:09:59 dfr Exp $ + * $Id: db_trace.c,v 1.29 1998/07/08 09:11:43 bde Exp $ */ #include <sys/param.h> @@ -128,7 +128,7 @@ db_print_stack_entry(name, narg, argnp, argp, callpc) while (narg) { if (argnp) db_printf("%s=", *argnp++); - db_printf("%n", db_get_value((int)argp, 4, FALSE)); + db_printf("%r", db_get_value((int)argp, 4, FALSE)); argp++; if (--narg != 0) db_printf(","); @@ -197,7 +197,7 @@ db_nextframe(fp, ip) eip = tf->tf_eip; ebp = tf->tf_ebp; db_printf( - "--- trap %#n, eip = %#n, esp = %#n, ebp = %#n ---\n", + "--- trap %#r, eip = %#r, esp = %#r, ebp = %#r ---\n", tf->tf_trapno, eip, esp, ebp); } break; @@ -206,7 +206,7 @@ db_nextframe(fp, ip) eip = tf->tf_eip; ebp = tf->tf_ebp; db_printf( - "--- syscall %#n, eip = %#n, esp = %#n, ebp = %#n ---\n", + "--- syscall %#r, eip = %#r, esp = %#r, ebp = %#r ---\n", tf->tf_eax, eip, esp, ebp); } break; @@ -216,7 +216,7 @@ db_nextframe(fp, ip) eip = tf->tf_eip; ebp = tf->tf_ebp; db_printf( - "--- interrupt, eip = %#n, esp = %#n, ebp = %#n ---\n", + "--- interrupt, eip = %#r, esp = %#r, ebp = %#r ---\n", eip, esp, ebp); } break; |
