[Wisp-cvs] wisp/users/dig elf.py,1.54,1.55

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

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

Modified Files:
	elf.py 
Log Message:
prefer Linkie.glue to Linkie.pastte throughout elf.py

Index: elf.py
===================================================================
RCS file: /cvsroot/wisp/wisp/users/dig/elf.py,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- elf.py	12 May 2003 21:36:02 -0000	1.54
+++ elf.py	13 May 2003 12:34:55 -0000	1.55
@@ -503,7 +503,7 @@
 
     binary = Linkie('<')
     memory_boundary = memory_bottom # must be at page boundary
-    binary.paste(0, make_ELF32_header('<', reloc = want_relocatable))
+    binary.glue(0, make_ELF32_header('<', reloc = want_relocatable), None)
     if want_relocatable:
         binary.place_symbol('#elf/type', ET.REL)
     else:
@@ -540,7 +540,8 @@
         for name in shentnames:
             if guess_ELF32_pflags(name) <> 0:
                 phentnames.append(name)
-        binary.paste(-4, make_ELF32_phtable('<', phentnames))
+        binary.align(4)
+        binary.glue(binary.memsz(), make_ELF32_phtable('<', phentnames), None)
 
     for name in shentnames:
         sections['.shstrtab'].emit_entry(name, '#.shstrtab/strings/' + name)
@@ -612,7 +613,8 @@
     # create section header table
     section_header_table = make_ELF32_shtable('<', shentnames,
                                               zero_addresses = want_relocatable)
-    binary.paste(-4, section_header_table)
+    binary.align(4)
+    binary.glue(binary.memsz(), section_header_table, None)
     binary.place_symbol('#elf/shstrndx', shentnames.index('.shstrtab') + 1)
     binary.link()
     return binary