Skip to content

Commit cea720f

Browse files
authored
Remove tabs embedded in strings used for formatting output (#515)
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.
1 parent a3f3775 commit cea720f

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

src/gcfinal.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -552,15 +552,15 @@ void printarrayblock(LispPTR base) {
552552
printf(" Length: %d cells.\n\n", bbase->arlen);
553553

554554
addr = ((LispPTR *)bbase) - 20;
555-
for (; addr < (LispPTR *)bbase; addr++) printf("%p %8x\n", (void *)addr, *addr);
556-
printf("%p %8x <- array header\n", (void *)addr, *addr);
555+
for (; addr < (LispPTR *)bbase; addr++) printf("%16p %8x\n", (void *)addr, *addr);
556+
printf("%16p %8x <- array header\n", (void *)addr, *addr);
557557
addr++;
558-
for (; addr < (LispPTR *)bbase + 20; addr++) printf("%p %8x\n", (void *)addr, *addr);
558+
for (; addr < (LispPTR *)bbase + 20; addr++) printf("%16p %8x\n", (void *)addr, *addr);
559559
printf(". . .\n");
560560

561561
addr = ((LispPTR *)btrailer) - 20;
562-
for (; addr < (LispPTR *)btrailer; addr++) printf("%p %8x\n", (void *)addr, *addr);
563-
printf("%p %8x <- array trailer\n", (void *)addr, *addr);
562+
for (; addr < (LispPTR *)btrailer; addr++) printf("%16p %8x\n", (void *)addr, *addr);
563+
printf("%16p %8x <- array trailer\n", (void *)addr, *addr);
564564
addr++;
565-
for (; addr < (LispPTR *)btrailer + 20; addr++) printf("%p %8x\n", (void *)addr, *addr);
565+
for (; addr < (LispPTR *)btrailer + 20; addr++) printf("%16p %8x\n", (void *)addr, *addr);
566566
}

src/testtool.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -683,9 +683,10 @@ int print_opcode(int pc, DLbyte *addr, struct fnhead *fnobj) {
683683
extern unsigned int oplength[256];
684684
int len = oplength[op] + 1;
685685

686-
printf(" 0%o (0x%x) ", pc, pc);
687-
for (i = 0; i < len; i++) printf("%o ", 0xFF & GETBYTE(addr + i));
688-
printf(" %s", opcode_table[op]);
686+
printf(" 0%04o (0x%04x) ", pc, pc);
687+
for (i = 0; i < len; i++) printf("%4o", 0xFF & GETBYTE(addr + i));
688+
for (; i < 9; i++) printf(" ");
689+
printf("%s", opcode_table[op]);
689690

690691
switch (op) {
691692
case 0:

0 commit comments

Comments
 (0)