Changeset 74644 in vbox for trunk

Timestamp:

Oct 6, 2018 7:58:37 PM (6 years ago)

Author:

vboxsync

Message:

IPRT: More adjustments to the LX and Mach-O loader code from kStuff. bugref:9232

File:

• trunk/include/iprt/formats/lx.h (modified) (21 diffs)

trunk/include/iprt/formats/lx.h

@@ -35 +35 @@
 #include <iprt/assertcompile.h>
 
+RT_C_DECLS_BEGIN
 
 #ifndef IMAGE_OS2_SIGNATURE_LX
@@ -41 +42 @@
 #endif
 
-#pragma pack(1) /** @todo mostly unnecessary. */
 
 /**
@@ -47 +47 @@
  * This structure is exactly 196 bytes long.
  */
-struct e32_exe
+typedef struct e32_exe
 {
     uint8_t             e32_magic[2];
@@ -125 +125 @@
     uint32_t            e32_stacksize;
     uint8_t             e32_res3[20];
-};
+} e32_exe;
 AssertCompileSize(struct e32_exe, 196);
 
@@ -198 +198 @@
 /** @} */
 
+
 /** @name Relocations (aka Fixups).
  * @{ */
-typedef union _offset
+typedef union r32_offset
 {
     uint16_t            offset16;
     uint32_t            offset32;
-} offset;
+} r32_offset;
+AssertCompileSize(r32_offset, 4);
 
 /** A relocation.
  * @remark this structure isn't very usable since LX relocations comes in too many size variations.
  */
-struct r32_rlc
+#pragma pack(1)
+typedef struct r32_rlc
 {
     uint8_t             nr_stype;
@@ -218 +221 @@
     union targetid
     {
-        offset          intref;
+        r32_offset      intref;
         union extfixup
         {
-            offset      proc;
+            r32_offset  proc;
             uint32_t    ord;
         } extref;
@@ -227 +230 @@
         {
             uint16_t    entry;
-            offset      addval;
+            r32_offset  addval;
         } addfix;
     } r32_target;
     uint16_t            r32_srccount;
     uint16_t            r32_chain;
-};
+} r32_rlc;
+#pragma pack()
+AssertCompileSize(r32_rlc, 16);
 
 /** @name Some attempt at size constanstants.
@@ -283 +288 @@
 
 /** The Object Table Entry. */
-struct o32_obj
+typedef struct o32_obj
 {
     /** The size of the object. */
@@ -297 +302 @@
     /** Reserved */
     uint32_t            o32_reserved;
-};
+} o32_obj;
+AssertCompileSize(o32_obj, 24);
 
 /** @name o32_flags
@@ -343 +349 @@
 
 /** A Object Page Map Entry. */
-struct o32_map
+typedef struct o32_map
 {
     /** The file offset of the page. */
@@ -351 +357 @@
     /** Per page flags describing how the page is encoded in the file. */
     uint16_t            o32_pageflags;
-};
+} o32_map;
+AssertCompileSize(o32_map, 8);
 
 /** @name o32 o32_pageflags
@@ -372 +379 @@
 
 /** Iteration Record format (RLE compressed page). */
-struct LX_Iter
+#pragma pack(1)
+typedef struct LX_Iter
 {
     /** Number of iterations. */
@@ -380 +388 @@
     /** The bytes. */
     uint8_t             LX_Iterdata;
-};
+} LX_Iter;
+#pragma pack()
+AssertCompileSize(LX_Iter, 5);
 
 /** @} */
@@ -386 +396 @@
 
 /** A Resource Table Entry */
-struct rsrc32
+#pragma pack(1)
+typedef struct rsrc32
 {
     /** Resource Type. */
@@ -398 +409 @@
     /** Offset of the resource that within the object. */
     uint32_t            offset;
-};
+} rsrc32;
+#pragma pack()
+AssertCompileSize(rsrc32, 14);
 
 
@@ -406 +419 @@
 /** Entry bundle.
  * Header descripting up to 255 entries that follows immediatly after this structure. */
-struct b32_bundle
+typedef struct b32_bundle
 {
     /** The number of entries. */
@@ -414 +427 @@
     /** The index of the object containing these entry points. */
     uint16_t            b32_obj;
-};
+} b32_bundle;
+AssertCompileSize(b32_bundle, 4);
 
 /** @name b32_type
@@ -434 +448 @@
 
 /** Entry point. */
-struct e32_entry
+#pragma pack(1)
+typedef struct e32_entry
 {
     /** Entry point flags */
@@ -441 +456 @@
     {
         /** ENTRY16 or ENTRY32. */
-        offset          e32_offset;
+        r32_offset      e32_offset;
         /** GATE16 */
         struct scallgate
@@ -459 +474 @@
         } e32_fwd;
     } e32_variant;
-};
+} e32_entry;
+#pragma pack()
 
 /** @name e32_flags
@@ -481 +497 @@
 /** @} */
 
-#pragma pack()
+
+RT_C_DECLS_END
 
 #endif