Changeset 8c25a4a in mainline

Timestamp:

2008-08-09T18:57:18Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b3105ff6

Parents:

619e7c9b

Message:

more descriptive structure definitions

Files:

• Makefile (modified) (2 diffs)
• tools/mkhord.py (modified) (2 diffs)
• tools/mktmpfs.py (modified) (4 diffs)
• tools/xstruct.py (added)

Makefile

@@ -135 +135 @@
         -$(MAKE) -C uspace distclean
         -$(MAKE) -C boot distclean
-        -rm Makefile.config
+        rm -f Makefile.config tools/*.pyc
 
 clean:
@@ -143 +143 @@
 
 cscope:
-        -rm cscope.out
-        -find kernel boot uspace -regex '^.*\.[chsS]$$' -print >srclist
-        -cscope -bi srclist
+        find kernel boot uspace -regex '^.*\.[chsS]$$' -print > srclist
+        rm -f cscope.out
+        cscope -bi srclist

tools/mkhord.py

@@ -39 +39 @@
         return (((size) + ((alignment) - 1)) & ~((alignment) - 1))
 
-
 def usage(prname):
         "Print usage syntax"
@@ -61 +60 @@
         inf = file(fs_image, "rb")
         outf = file(sys.argv[3], "wb")
-
+        
         header_size = align_up(18, align)
         aligned_size = align_up(os.path.getsize(fs_image), align)
-
         
         outf.write(struct.pack("<4sBBLQ", "HORD", 1, 1, header_size, aligned_size))

tools/mktmpfs.py

@@ -34 +34 @@
 import os
 import struct
+import xstruct
+
+HEADER = xstruct.convert("little: char[5]")
+DENTRY = xstruct.convert("little: uint8_t uint32_t")
+SIZE = xstruct.convert("little: uint32_t")
+
+DENTRY_NONE = 0
+DENTRY_FILE = 1
+DENTRY_DIRECTORY = 2
 
 def usage(prname):
         "Print usage syntax"
-        print prname + " <ALIGNMENT> <PATH> <IMAGE>"
+        print prname + " <PATH> <IMAGE>"
 
 def recursion(root, outf):
         "Recursive directory walk"
-        
-        payload_size = 0
         
         for name in os.listdir(root):
@@ -48 +55 @@
                 
                 if (os.path.isfile(canon)):
-                        outf.write(struct.pack("<BL" + ("%d" % len(name)) + "s", 1, len(name), name))
-                        payload_size += 5 + len(name)
+                        outf.write(struct.pack(DENTRY, DENTRY_FILE, len(name)))
+                        outf.write(xstruct.little_string(name))
                         size = os.path.getsize(canon)
                         rd = 0;
-                        outf.write(struct.pack("<L", size))
-                        payload_size += 4
+                        outf.write(struct.pack(SIZE, size))
                         
                         inf = file(canon, "r")
@@ -59 +65 @@
                                 data = inf.read(4096);
                                 outf.write(data)
-                                payload_size += len(data)
                                 rd += len(data)
                         inf.close()
                 
                 if (os.path.isdir(canon)):
-                        outf.write(struct.pack("<BL" + ("%d" % len(name)) + "s", 2, len(name), name))
-                        payload_size += 5 + len(name)
-                        payload_size += recursion(canon, outf)
-                        outf.write(struct.pack("<BL", 0, 0))
-                        payload_size += 5
-        
-        return payload_size
+                        outf.write(struct.pack(DENTRY, DENTRY_DIRECTORY, len(name)))
+                        outf.write(xstruct.little_string(name))
+                        recursion(canon, outf)
+                        outf.write(struct.pack(DENTRY, DENTRY_NONE, 0))
 
 def main():
@@ -84 +86 @@
         outf = file(sys.argv[2], "w")
         
-        outf.write(struct.pack("<5s", "TMPFS"))
+        outf.write(struct.pack(HEADER, "TMPFS"))
         recursion(path, outf)
-        outf.write(struct.pack("<BL", 0, 0))
+        outf.write(struct.pack(DENTRY, DENTRY_NONE, 0))
 
         outf.close()