From 5aebf49804f4366c2a0f2e754683b73f0d659b78 Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Wed, 30 Oct 2024 17:53:45 -0700 Subject: [PATCH] Remove tabs embedded in strings used for formatting output Files gcfinal.c and testool.c both contain literal TAB characters embedded in printf() format strings in an attempt to align output. The output formatting depends on the user's simulated tab settings and therefore may not produce the expected results. The output formatting is rewritten to make tab characters unnecessary. --- src/gcfinal.c | 12 ++++++------ src/testtool.c | 7 ++++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/gcfinal.c b/src/gcfinal.c index 19f24346..0d10de90 100644 --- a/src/gcfinal.c +++ b/src/gcfinal.c @@ -552,15 +552,15 @@ void printarrayblock(LispPTR base) { printf(" Length: %d cells.\n\n", bbase->arlen); addr = ((LispPTR *)bbase) - 20; - for (; addr < (LispPTR *)bbase; addr++) printf("%p %8x\n", (void *)addr, *addr); - printf("%p %8x <- array header\n", (void *)addr, *addr); + for (; addr < (LispPTR *)bbase; addr++) printf("%16p %8x\n", (void *)addr, *addr); + printf("%16p %8x <- array header\n", (void *)addr, *addr); addr++; - for (; addr < (LispPTR *)bbase + 20; addr++) printf("%p %8x\n", (void *)addr, *addr); + for (; addr < (LispPTR *)bbase + 20; addr++) printf("%16p %8x\n", (void *)addr, *addr); printf(". . .\n"); addr = ((LispPTR *)btrailer) - 20; - for (; addr < (LispPTR *)btrailer; addr++) printf("%p %8x\n", (void *)addr, *addr); - printf("%p %8x <- array trailer\n", (void *)addr, *addr); + for (; addr < (LispPTR *)btrailer; addr++) printf("%16p %8x\n", (void *)addr, *addr); + printf("%16p %8x <- array trailer\n", (void *)addr, *addr); addr++; - for (; addr < (LispPTR *)btrailer + 20; addr++) printf("%p %8x\n", (void *)addr, *addr); + for (; addr < (LispPTR *)btrailer + 20; addr++) printf("%16p %8x\n", (void *)addr, *addr); } diff --git a/src/testtool.c b/src/testtool.c index bf6b8a73..3e83b213 100644 --- a/src/testtool.c +++ b/src/testtool.c @@ -683,9 +683,10 @@ int print_opcode(int pc, DLbyte *addr, struct fnhead *fnobj) { extern unsigned int oplength[256]; int len = oplength[op] + 1; - printf(" 0%o (0x%x) ", pc, pc); - for (i = 0; i < len; i++) printf("%o ", 0xFF & GETBYTE(addr + i)); - printf(" %s", opcode_table[op]); + printf(" 0%04o (0x%04x) ", pc, pc); + for (i = 0; i < len; i++) printf("%4o", 0xFF & GETBYTE(addr + i)); + for (; i < 9; i++) printf(" "); + printf("%s", opcode_table[op]); switch (op) { case 0: