Update of /cvsroot/wisp/wisp/users/dig
In directory sc8-pr-cvs1:/tmp/cvs-serv25638
Modified Files:
linkie.py tran.py
Log Message:
added the title argument to Linkie.dump
Index: linkie.py
===================================================================
RCS file: /cvsroot/wisp/wisp/users/dig/linkie.py,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- linkie.py 13 May 2003 13:42:34 -0000 1.61
+++ linkie.py 17 May 2003 05:48:12 -0000 1.62
@@ -254,13 +254,13 @@
del this._linker_notes[i]
return len(this._linker_notes)
- def dump (this):
+ def dump (this, title = 'some-linkie'):
filesz = len(this._contents)
skipsz = this._skipped
memsz = filesz + skipsz
- print 'Linkie (0x%x + 0x%x = 0x%x)' % \
- (filesz, skipsz, memsz),
- print 'aligned at 0x%x' % this._alignment
+ print '%s (0x%x + 0x%x = 0x%x)' % (title, filesz, skipsz, memsz),
+ if this._alignment != 1: print 'aligned at 0x%x' % this._alignment,
+ print
rsymbols = {}; othersymbols = []
rnotes = {}; othernotes = []
for sym, val in this._symbols:
Index: tran.py
===================================================================
RCS file: /cvsroot/wisp/wisp/users/dig/tran.py,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- tran.py 17 May 2003 05:42:30 -0000 1.80
+++ tran.py 17 May 2003 05:48:12 -0000 1.81
@@ -312,9 +312,9 @@
if verbose: print '(%s) %s' % (' '.join(map(str, Regstack)), tok)
interpreter.state(tok)
tok = prep.get_token()
- print 'TEXT'; interpreter.text.dump()
- print 'DATA'; interpreter.data.dump()
- print 'BSS'; interpreter.bss.dump()
+ interpreter.text.dump(title = 'TEXT')
+ interpreter.data.dump(title = 'DATA')
+ interpreter.bss.dump(title = 'BSS')
if Regstack:
raise 'Regstack not empty after parsing ended', Regstack
if format == 'elf':
|
