[Wisp-cvs] wisp/users/dig elf.py,1.62,1.63 elf.tran,1.3,1.4

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

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

Modified Files:
	elf.py elf.tran 
Log Message:
merged make_ELF32_phtable into make_ELF32_object

Index: elf.py
===================================================================
RCS file: /cvsroot/wisp/wisp/users/dig/elf.py,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- elf.py	18 May 2003 16:46:02 -0000	1.62
+++ elf.py	18 May 2003 16:50:25 -0000	1.63
@@ -333,11 +333,6 @@
     if reloc: h.place_symbol('&_start', 0); h.place_symbol('!elf/proghdr', 0)
     return h
 
-def make_ELF32_phtable (byte_order, names):
-    input = [Integer_Literal(len(names)), 'make-elf32-phtable']
-    for name in names: input = ["'", name] + input # reversed
-    return interpret_single(input, byte_order, include = 'elf')
-
 def make_ELF32_shtable (byte_order, names, zero_addresses = 0):
     t = Linkie(byte_order)
     t.align(4)
@@ -515,8 +510,9 @@
         for name in shentnames:
             if guess_ELF32_pflags(name) <> 0:
                 phentnames.append(name)
-        binary.align(4)
-        binary.glue(binary.memsz(), make_ELF32_phtable('<', phentnames), None)
+        input = [Integer_Literal(len(phentnames)), 'make-elf32-phtable']
+        for name in phentnames: input = ["'", name] + input # reversed
+        interpret_single(input, binary, include = 'elf')
 
     for name in shentnames:
         sections['.shstrtab'].emit_entry(name, '#.shstrtab/strings/' + name)

Index: elf.tran
===================================================================
RCS file: /cvsroot/wisp/wisp/users/dig/elf.tran,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- elf.tran	18 May 2003 16:46:02 -0000	1.3
+++ elf.tran	18 May 2003 16:50:25 -0000	1.4
@@ -33,7 +33,6 @@
 ;
 
 :[ ] make-elf32-phentry \ ( section-name -- )
-    4 align
     dup mingle #*/p_type t,
     dup mingle !* t,        \ offset
     dup mingle &* t,        \ p_vaddr