From 37d15ed4700b4099e3a8522fbb2d81216cc093e1 Mon Sep 17 00:00:00 2001 From: ketmar Date: Thu, 22 Mar 2012 05:27:37 +0200 Subject: [PATCH] tools fixed --- tools/disasm.bob | 4 +++- tools/labellist.bob | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/disasm.bob b/tools/disasm.bob index 7df3217..5eec030 100755 --- a/tools/disasm.bob +++ b/tools/disasm.bob @@ -96,11 +96,13 @@ define isBranch (mnemo) { fl = new File(args.length<1?"awish.vmd":args[0], "rb"); if (!fl) abort("no code file"); sign = fl.readBuf(4); -if (sign != "AVM1") abort("invalid code file"); +if (sign != "AVM2") abort("invalid code file"); csize = fl.readWord()^0x2a2a; // code size rcnt = fl.readWord()^0x2a2a; // number of fixups elcnt = fl.readWord()^0x2a2a; // number of extern labels lcnt = fl.readWord()^0x2a2a; // number of labels +gvmax = fl.readWord()^0x2a2a; // number of global vars +tvmax = fl.readWord()^0x2a2a; // number of thread local vars writeln("code: %d bytes, %d public labels, %d relocations, %d externs".format(csize, lcnt, rcnt, elcnt)); code = fl.readBuf(csize); for (local f = 0; f < code.length; ++f) code[f] ^= 0x2a; diff --git a/tools/labellist.bob b/tools/labellist.bob index 08334fb..7bf1ad5 100755 --- a/tools/labellist.bob +++ b/tools/labellist.bob @@ -37,11 +37,13 @@ list = \[]; fl = new File(args.length<1?"awish.vmd":args[0], "rb"); if (!fl) abort("no code file"); sign = fl.readBuf(4); -if (sign != "AVM1") abort("invalid code file"); +if (sign != "AVM2") abort("invalid code file"); csize = fl.readWord()^0x2a2a; // code size rcnt = fl.readWord()^0x2a2a; // number of fixups elcnt = fl.readWord()^0x2a2a; // number of extern labels lcnt = fl.readWord()^0x2a2a; // number of labels +gvmax = fl.readWord()^0x2a2a; // number of global vars +tvmax = fl.readWord()^0x2a2a; // number of thread local vars writeln("code: %d bytes, %d public labels, %d relocations, %d externs".format(csize, lcnt, rcnt, elcnt)); fl.position += csize; // skip code fl.position += rcnt*2; // skip fixups -- 2.11.4.GIT