?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
InterpretDebug-mods: fix escaping and newlines
[nedit-bw.git] / InterpretDebug-mods.patch
blob48e2d0007ecd62c4e85e354a6fb23f439bf12e0e
1 ---
2
3 source/interpret.c | 104 +++++++++++++++++++++++++++++++++--------------------
4 source/interpret.h | 2 -
5 source/parse.y | 14 ++-----
6 source/userCmds.c | 4 +-
7 4 files changed, 73 insertions(+), 51 deletions(-)
8
9 diff --quilt old/source/interpret.c new/source/interpret.c
10 --- old/source/interpret.c
11 +++ new/source/interpret.c
12 @@ -161,25 +161,25 @@ static SparseArrayEntry *allocateSparseA
13
14 #if defined(DEBUG_ASSEMBLY) || defined(DEBUG_STACK)
15 #define DEBUG_DISASSEMBLER
16 static const char *printd(const char *f, ...);
17 static int outPrintd();
18 -static void disasm(Inst *inst, int nInstr);
19 +static void disasm(const char *name, Inst *inst, int nInstr);
20 static void disasmInternal(Inst *inst, int nInstr);
21 #endif /* #if defined(DEBUG_ASSEMBLY) || defined(DEBUG_STACK) */
22
23 #ifdef DEBUG_ASSEMBLY /* for disassembly */
24 -#define DISASM(i, n) disasm(i, n)
25 +#define DISASM(name, i, n) disasm(name, i, n)
26 #else /* #ifndef DEBUG_ASSEMBLY */
27 -#define DISASM(i, n)
28 +#define DISASM(name, i, n)
29 #endif /* #ifndef DEBUG_ASSEMBLY */
30
31 #ifdef DEBUG_STACK /* for run-time instruction and stack trace */
32 static void stackdump(int n, int extra);
33 static void stackdumpInternal(int n, int extra);
34 #define STACKDUMP(n, x) stackdump(n, x)
35 -#define DISASM_RT(i, n) disasm(i, n)
36 +#define DISASM_RT(i, n) disasm(NULL, i, n)
37 #else /* #ifndef DEBUG_STACK */
38 #define STACKDUMP(n, x)
39 #define DISASM_RT(i, n)
40 #endif /* #ifndef DEBUG_STACK */
41
42 @@ -324,11 +324,11 @@ void BeginCreatingProgram(void)
43 /*
44 ** Finish up the program under construction, and return it (code and
45 ** symbol table) as a package that ExecuteMacro can execute. This
46 ** program must be freed with FreeProgram.
47 */
48 -Program *FinishCreatingProgram(void)
49 +Program *FinishCreatingProgram(const char *name)
50 {
51 Program *newProg;
52 int progLen, fpOffset = 0;
53 Symbol *s;
54
55 @@ -342,12 +342,15 @@ Program *FinishCreatingProgram(void)
56
57 /* Local variables' values are stored on the stack. Here we assign
58 frame pointer offsets to them. */
59 for (s = newProg->localSymList; s != NULL; s = s->next)
60 s->value.val.n = fpOffset++;
61 -
62 - DISASM(newProg->code, ProgP - Prog);
63 +
64 + if (name)
65 + newProg->name = strdup(name);
66 +
67 + DISASM(newProg->name, newProg->code, ProgP - Prog);
68
69 return newProg;
70 }
71
72 void FreeProgram(Program *prog)
73 @@ -2919,11 +2922,11 @@ static void arrayDisposeNode(rbTreeNode
74 src->color = -1;
75 }
76
77 SparseArrayEntry *ArrayNew(void)
78 {
79 - return((SparseArrayEntry *)rbTreeNew(arrayEmptyAllocator));
80 + return((SparseArrayEntry *)rbTreeNew(arrayEmptyAllocator));
81 }
82
83 /*
84 ** insert a DataValue into an array, allocate the array if needed
85 ** keyStr must be a string that was allocated with AllocString()
86 @@ -3601,32 +3604,50 @@ int outPrintd()
87 #ifdef DEBUG_DISASSEMBLER /* dumping values in disassembly or stack dump */
88 static void dumpVal(DataValue dv)
89 {
90 switch (dv.tag) {
91 case INT_TAG:
92 - printd("i=%d", dv.val.n);
93 + printd("<integer> %d", dv.val.n);
94 break;
95 case STRING_TAG:
96 {
97 - int k;
98 - char s[21];
99 + int k, l;
100 + char s[64];
101 char *src = dv.val.str.rep;
102 if (!src) {
103 - printd("s=<NULL>");
104 + printd("<string> <NULL>");
105 }
106 else {
107 - for (k = 0; src[k] && k < sizeof s - 1; k++) {
108 - s[k] = isprint(src[k]) ? src[k] : '?';
109 + for (k = 0, l = 0; src[k] && l < sizeof s - 1; k++, l++) {
110 + char *e;
111 + const char to[] = "\\\"ntbrfave";
112 +#ifdef EBCDIC_CHARSET
113 + const char from[] = "\\\"\n\t\b\r\f\a\v\x27"; /* EBCDIC escape */
114 +#else
115 + const char from[] = "\\\"\n\t\b\r\f\a\v\x1B"; /* ASCII escape */
116 +#endif
117 + if ((e = strchr(from, src[k]))) {
118 + if (l < sizeof s - 2) {
119 + s[l++] = '\\';
120 + s[l] = to[e - from];
121 + }
122 + }
123 + else if (isprint(src[k])) {
124 + s[l] = src[k];
125 + }
126 + else {
127 + s[l] = '?';
128 + }
129 }
130 - s[k] = 0;
131 - printd("s=\"%s\"%s[%d]", s,
132 + s[l] = 0;
133 + printd("<string> \"%s\"%s[%d]", s,
134 src[k] ? "..." : "", strlen(src));
135 }
136 }
137 break;
138 case ARRAY_TAG:
139 - printd("%08p <array>[%d]", dv.val.arrayPtr, ArraySize(&dv));
140 + printd("<array> %8p[%d]", dv.val.arrayPtr, ArraySize(&dv));
141 break;
142 case NO_TAG:
143 if (!dv.val.inst) {
144 printd("<no value>");
145 }
146 @@ -3699,98 +3720,103 @@ static void disasmInternal(Inst *inst, i
147 "SUBR_CALL_STACKED_N", /* callSubroutineStackedN */
148 "UNPACKTOARGS", /* unpackArrayToArgs */
149 };
150 int i, j;
151
152 - printd("\n");
153 for (i = 0; i < nInstr; ++i) {
154 - printd("Prog %8p ", &inst[i]);
155 + printd("Prog %8p", &inst[i]);
156 for (j = 0; j < N_OPS; ++j) {
157 if (inst[i].func == OpFns[j]) {
158 - printd("%22s ", opNames[j]);
159 + printd(" %23s", opNames[j]);
160 if (j == OP_PUSH_SYM || j == OP_ASSIGN) {
161 Symbol *sym = inst[i+1].sym;
162 - printd("%s", sym->name);
163 + printd(" %s", sym->name);
164 if (sym->value.tag == STRING_TAG &&
165 strncmp(sym->name, "string #", 8) == 0) {
166 + printd(" ");
167 dumpVal(sym->value);
168 }
169 ++i;
170 }
171 else if (j == OP_BRANCH || j == OP_BRANCH_FALSE ||
172 j == OP_BRANCH_NEVER || j == OP_BRANCH_TRUE) {
173 - printd("to=(%d) %p", inst[i+1].value,
174 + printd(" to=(%+d) %8p", inst[i+1].value,
175 &inst[i+1] + inst[i+1].value);
176 ++i;
177 }
178 else if (j == OP_CONCAT) {
179 - printd("nExpr=%d", inst[i+1].value);
180 + printd(" nExpr=%d", inst[i+1].value);
181 ++i;
182 }
183 else if (j == OP_SUBR_CALL) {
184 int args = inst[i+2].value;
185 - printd("%s ", inst[i+1].sym->name);
186 + printd(" %s", inst[i+1].sym->name);
187 if (args < 0) {
188 - printd("%d+args[] (%d)", -args - 1, args);
189 + printd(" %d+args[] (%d)", -args - 1, args);
190 }
191 else {
192 - printd("%d args", args);
193 + printd(" %d args", args);
194 }
195 i += 2;
196 }
197 else if (j == OP_SUBR_CALL_STACKED_N) {
198 - printd("%s args[] (?)", inst[i+1].sym->name);
199 + printd(" %s args[] (?)", inst[i+1].sym->name);
200 ++i;
201 }
202 else if (j == OP_BEGIN_ARRAY_ITER) {
203 - printd("%s in", inst[i+1].sym->name);
204 + printd(" %s in", inst[i+1].sym->name);
205 ++i;
206 }
207 else if (j == OP_ARRAY_ITER) {
208 - printd("%s = %s++ end-loop=(%d) %p",
209 + printd(" %s = %s++ end-loop=(%+d) %8p",
210 inst[i+1].sym->name,
211 inst[i+2].sym->name,
212 - inst[i+3].value, &inst[i+3] + inst[i+3].value);
213 + inst[i+3].value,
214 + &inst[i+3] + inst[i+3].value);
215 i += 3;
216 }
217 else if (j == OP_ARRAY_REF ||
218 j == OP_ARRAY_DELETE ||
219 j == OP_ARRAY_ASSIGN ||
220 j == OP_ANONARRAY_INDEX_VAL ||
221 j == OP_NAMED_ARG1 ||
222 j == OP_NAMED_ARGN) {
223 - printd("nDim=%d", inst[i+1].value);
224 + printd(" nDim=%d", inst[i+1].value);
225 ++i;
226 }
227 else if (j == OP_ARRAY_REF_ASSIGN_SETUP) {
228 - printd("binOp=%s ", inst[i+1].value ? "true" : "false");
229 - printd("nDim=%d", inst[i+2].value);
230 + printd(" binOp=%s nDim=%d",
231 + inst[i+1].value ? "true" : "false",
232 + inst[i+2].value);
233 i += 2;
234 }
235 else if (j == OP_PUSH_ARRAY_SYM) {
236 - printd("%s", inst[++i].sym->name);
237 - printd(" %s", inst[i+1].value ? "createAndRef" : "refOnly");
238 - ++i;
239 + printd(" %s %s",
240 + inst[i+1].sym->name,
241 + inst[i+2].value ? "createAndRef" : "refOnly");
242 + i += 2;
243 }
244
245 printd("\n");
246 break;
247 }
248 }
249 if (j == N_OPS) {
250 - printd("%x\n", inst[i].value);
251 + printd(" %x\n", inst[i].value);
252 }
253 }
254 }
255
256 -static void disasm(Inst *inst, int nInstr)
257 +static void disasm(const char *name, Inst *inst, int nInstr)
258 {
259 static int outIsTTY = -1;
260 if (outIsTTY == -1) outIsTTY = isatty(fileno(stdout));
261 if (outIsTTY) { printd("\033[H"); }
262 + if (name) printd(">> %s\n", name);
263 disasmInternal(inst, nInstr);
264 if (outIsTTY) { printd("\033[J\n"); }
265 + if (name) printd("\n");
266 outPrintd();
267 }
268 #endif /* #ifdef DEBUG_DISASSEMBLER */
269
270 #ifdef DEBUG_STACK /* for run-time stack dumping */
271 @@ -3914,11 +3940,11 @@ static void stackdumpInternal(int n, int
272 printd("--------------Stack base--------------\n");
273 #else
274 if (outpt < TheStack)
275 printd("--------------Stack base--------------\n");
276 stackdumpframe(arrow, outpt, FrameP, StackP, '*');
277 - printd("Stack ----->\n");
278 + printd("Stack ----->\n\n");
279 #endif /* #ifdef DEBUG_STACK_HEADFIRST */
280 }
281
282 static void stackdump(int n, int extra)
283 {
284 diff --quilt old/source/interpret.h new/source/interpret.h
285 --- old/source/interpret.h
286 +++ new/source/interpret.h
287 @@ -149,11 +149,11 @@ Inst *GetPC(void);
288 Symbol *InstallIteratorSymbol(void);
289 Symbol *LookupStringConstSymbol(const char *value);
290 Symbol *InstallStringConstSymbol(const char *str);
291 Symbol *LookupSymbol(const char *name);
292 Symbol *InstallSymbol(const char *name, enum symTypes type, DataValue value);
293 -Program *FinishCreatingProgram(void);
294 +Program *FinishCreatingProgram(const char *name);
295 void SwapCode(Inst *start, Inst *boundary, Inst *end);
296 void StartLoopAddrList(void);
297 int AddBreakAddr(Inst *addr);
298 int AddContinueAddr(Inst *addr);
299 void FillLoopAddrs(Inst *breakAddr, Inst *continueAddr);
300 diff --quilt old/source/parse.y new/source/parse.y
301 --- old/source/parse.y
302 +++ new/source/parse.y
303 @@ -525,33 +525,29 @@ blank: /* nothing */
304 ** to where parsing failed in stoppedAt.
305 */
306 Program *ParseMacro(char *expr, char **msg, char **stoppedAt, const char *name)
307 {
308 Program *prog;
309 - static const char *prefix = ">> ";
310
311 BeginCreatingProgram();
312
313 + if (!name)
314 + name = "--unknown--";
315 +
316 /* call yyparse to parse the string and check for success. If the parse
317 failed, return the error message and string index (the grammar aborts
318 parsing at the first error) */
319 InPtr = expr;
320 if (yyparse()) {
321 *msg = ErrMsg;
322 *stoppedAt = InPtr;
323 - FreeProgram(FinishCreatingProgram());
324 + FreeProgram(FinishCreatingProgram(NULL));
325 return NULL;
326 }
327
328 /* get the newly created program */
329 - prog = FinishCreatingProgram();
330 -
331 - if (!name)
332 - name = "--unknown--";
333 -
334 - prog->name = XtMalloc(strlen(name) + strlen(prefix) + 1);
335 - strcat(strcpy(prog->name, prefix), name);
336 + prog = FinishCreatingProgram(name);
337
338 /* parse succeeded */
339 *msg = "";
340 *stoppedAt = InPtr;
341 return prog;
342 diff --quilt old/source/userCmds.c new/source/userCmds.c
343 --- old/source/userCmds.c
344 +++ new/source/userCmds.c
345 @@ -1284,17 +1284,17 @@ static int doMacroMenuCmd(WindowInfo *wi
346 }
347
348 int DoNamedMacroMenuCmd(WindowInfo *window, const char *itemName)
349 {
350 return doMacroMenuCmd(window, itemName, MacroMenuItems, NMacroMenuItems,
351 - "macro-menu>");
352 + "Macro Menu>");
353 }
354
355 int DoNamedBGMenuCmd(WindowInfo *window, const char *itemName)
356 {
357 return doMacroMenuCmd(window, itemName, BGMenuItems, NBGMenuItems,
358 - "background-menu>");
359 + "Background Menu>");
360 }
361
362 /*
363 ** Cache user menus:
364 ** Rebuild all of the Shell, Macro, Background menus of given editor window.
My NEdit quilt queue