diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | debug.c | 25 | ||||
| -rw-r--r-- | helpers/ChangeLog | 6 | ||||
| -rw-r--r-- | helpers/fixdump.awk | 140 |
4 files changed, 107 insertions, 69 deletions
@@ -1,3 +1,8 @@ +2016-03-07 Arnold D. Robbins <arnold@skeeve.com> + + * profile.c (print_instruction): Further improvements in + instruction dump, especially for when pretty-printing. + 2016-03-03 Arnold D. Robbins <arnold@skeeve.com> * profile.c (pp_list): Unconditionally compute delimlen. Avoids @@ -3805,6 +3805,31 @@ print_instruction(INSTRUCTION *pc, Func_print print_func, FILE *fp, int in_dump) print_func(fp, "[branch_end = %p]\n", pc->branch_end); break; + case Op_K_while: + print_func(fp, "[while_body = %p] [target_break = %p]\n", (pc+1)->while_body, pc->target_break); + break; + + case Op_K_do: + print_func(fp, "[doloop_cond = %p] [target_break = %p]\n", (pc+1)->doloop_cond, pc->target_break); + break; + + case Op_K_for: + print_func(fp, "[forloop_cond = %p] ", (pc+1)->forloop_cond); + /* fall through */ + case Op_K_arrayfor: + print_func(fp, "[forloop_body = %p] ", (pc+1)->forloop_body); + print_func(fp, "[target_break = %p] [target_continue = %p]\n", pc->target_break, pc->target_continue); + break; + + case Op_K_switch: + print_func(fp, "[switch_start = %p] [switch_end = %p]\n", (pc+1)->switch_start, (pc+1)->switch_end); + break; + + case Op_K_case: + case Op_K_default: + print_func(fp, "[stmt_start = %p] [stmt_end = %p]\n", pc->stmt_start, pc->stmt_end); + break; + case Op_var_update: print_func(fp, "[update_%s()]\n", get_spec_varname(pc->update_var)); break; diff --git a/helpers/ChangeLog b/helpers/ChangeLog index ac00c1f5..aaf1e489 100644 --- a/helpers/ChangeLog +++ b/helpers/ChangeLog @@ -1,3 +1,9 @@ +2016-03-07 Arnold D. Robbins <arnold@skeeve.com> + + * fixdump.awk (translate): Remove extraneous spaces in + prints of code targets. + * fixdump.awk: Convert to normal Unix line endings. + 2015-08-28 Daniel Richard G. <skunk@iSKUNK.ORG> * testdfa.c: Define and use the USE_EBCDIC cpp symbol diff --git a/helpers/fixdump.awk b/helpers/fixdump.awk index b03f03f7..3ec502d2 100644 --- a/helpers/fixdump.awk +++ b/helpers/fixdump.awk @@ -1,69 +1,71 @@ -#! /usr/bin/gawk -f
-
-BEGIN {
- address_re = "0x[[:xdigit:]]+"
- bracketed_address = "\\[(([[:space:]]*[[:digit:]]*:)?|[[:alpha:]_]+ = )0x[[:xdigit:]]+\\]"
-}
-
-{
- line[NR] = $0
- extract_addresses($0, NR)
-}
-
-END {
- for (i = 1; i <= NR; i++) {
- if (line[i] !~ address_re) {
- print line[i]
- continue
- }
-
- translate(line[i])
- }
-}
-
-# Global arrays
-#
-# Address[line] --- Address of instruction - first hex number
-# Target[address] = 1 --- Address is target of a jump
-# Newaddr[address] --- Replacement address, counting from 1
-
-function extract_addresses(line, num, data, i, n, seps, addr)
-{
- if (line !~ address_re)
- return
-
- split(line, data, bracketed_address, seps)
- n = length(seps)
-
- for (i = 1; i <= n; i++) {
- addr = gensub(".*(" address_re ").*", "\\1", 1, seps[i])
- if (i == 1)
- Address[num] = addr
- else {
- Target[addr]++
- if (! (addr in Newaddr))
- Newaddr[addr] = new_address()
- }
- }
-}
-
-function new_address()
-{
- return sprintf("%8d", ++Address_seed)
-}
-
-function translate(line, n, data, seps, i, newline)
-{
- split(line, data, address_re, seps)
- n = length(seps)
- newline = line
- for (i = 1; i <= n; i++) {
- if (! (seps[i] in Target)) {
- gsub(seps[i], " ", newline)
- continue
- }
- gsub(seps[i], Newaddr[seps[i]], newline)
- }
-
- print newline
-}
+#! /usr/bin/gawk -f + +BEGIN { + address_re = "0x[[:xdigit:]]+" + bracketed_address = "\\[(([[:space:]]*[[:digit:]]*:)?|[[:alpha:]_]+ = )0x[[:xdigit:]]+\\]" +} + +{ + line[NR] = $0 + extract_addresses($0, NR) +} + +END { + for (i = 1; i <= NR; i++) { + if (line[i] !~ address_re) { + print line[i] + continue + } + + translate(line[i]) + } +} + +# Global arrays +# +# Address[line] --- Address of instruction - first hex number +# Target[address] = 1 --- Address is target of a jump +# Newaddr[address] --- Replacement address, counting from 1 + +function extract_addresses(line, num, data, i, n, seps, addr) +{ + if (line !~ address_re) + return + + split(line, data, bracketed_address, seps) + n = length(seps) + + for (i = 1; i <= n; i++) { + addr = gensub(".*(" address_re ").*", "\\1", 1, seps[i]) + if (i == 1) + Address[num] = addr + else { + Target[addr]++ + if (! (addr in Newaddr)) + Newaddr[addr] = new_address() + } + } +} + +function new_address() +{ + return sprintf("%8d", ++Address_seed) +} + +function translate(line, n, data, seps, i, newline) +{ + split(line, data, address_re, seps) + n = length(seps) + newline = line + for (i = 1; i <= n; i++) { + if (! (seps[i] in Target)) { + gsub(seps[i], " ", newline) + continue + } + gsub(seps[i], Newaddr[seps[i]], newline) + } + + gsub(/ = +/, " = ", newline) + + print newline +} |