[Wisp-cvs] wisp/users/dig make-pe-exe.py,1.64,1.65

[<di...@us...>]

Update of /cvsroot/wisp/wisp/users/dig
In directory sc8-pr-cvs1:/tmp/cvs-serv4140

Modified Files:
	make-pe-exe.py 
Log Message:
merged .istubs to .text

Index: make-pe-exe.py
===================================================================
RCS file: /cvsroot/wisp/wisp/users/dig/make-pe-exe.py,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- make-pe-exe.py	16 May 2003 14:56:59 -0000	1.64
+++ make-pe-exe.py	16 May 2003 15:02:36 -0000	1.65
@@ -74,8 +74,6 @@
 
 print 'TEXT'; text.dump()
 
-istubs = Linkie('<')
-
 data = Linkie('<')
 data.place_symbol('&message')
 data.emit_string('Hello, world!\x0D\x0A')
@@ -86,8 +84,8 @@
 
 imports = Linkie('<')
 
-sections = {'.text': text, '.istubs': istubs, '.data': data, '.bss': bss, '.imports': imports}
-sectnames = ['.text', '.istubs', '.data', '.bss', '.imports']
+sections = {'.text': text, '.data': data, '.bss': bss, '.imports': imports}
+sectnames = ['.text', '.data', '.bss', '.imports']
 
 e = Linkie('<');
 e.glue(0, make_pe_mz_stub('OS too broken'), 0x100)
@@ -104,7 +102,6 @@
     e.place_symbol('#' + s + '/reloc', 0)
     e.place_symbol('#' + s + '/lineno', 0)
 e.place_symbol('#.text/flags',    0x60000020)
-e.place_symbol('#.istubs/flags',  0x60000020)
 e.place_symbol('#.data/flags',    0xc0000040)
 e.place_symbol('#.bss/flags',     0xc0000080)
 e.place_symbol('#.imports/flags', 0xc0000040)
@@ -166,10 +163,10 @@
 # generate stub procedures
 for dll in imports_by_dlls.keys():
     for sym in imports_by_dlls[dll].keys():
-        istubs.align(8)
-        istubs.place_symbol('&' + sym + '@' + dll)
-        istubs[::1] = 0xFF, 0x25
-        istubs.emit_tetra_sum(['&.imports/slot/' + sym + '@' + dll])
+        text.align(8)
+        text.place_symbol('&' + sym + '@' + dll)
+        text[::1] = 0xFF, 0x25
+        text.emit_tetra_sum(['&.imports/slot/' + sym + '@' + dll])
 
 # paste sections together
 e.align(512)
@@ -206,7 +203,7 @@
 e.place_symbol('#aout/magic', 0x010B) # PE32
 e.place_symbol('#aout/linker-version-major', 0)
 e.place_symbol('#aout/linker-version-minor', 1)
-e.place_symbol('#aout/text-size', roundup(text.memsz(), 0x200) + roundup(istubs.memsz(), 0x200))
+e.place_symbol('#aout/text-size', roundup(text.memsz(), 0x200))
 e.place_symbol('#aout/data-size', roundup(data.memsz(), 0x200))
 e.place_symbol('#aout/bss-size', roundup(bss.memsz(), 0x200))
 e.place_symbol('#aout/image-base', 0x00400000)