Changeset 58 for trunk/include/k

Timestamp:

Oct 12, 2013, 10:18:21 PM (12 years ago)

Author:

bird

Message:

Mach-O: Carve segments from the mach-o segments instead of the sections inside them. This works better for non-object files.

Location:

trunk/include/k

Files:

• kErrors.h (modified) (4 diffs)
• kLdr.h (modified) (2 diffs)

trunk/include/k/kErrors.h

@@ -208 +208 @@
 /** The image has no UUID. */
 #define KLDR_ERR_NO_IMAGE_UUID                          (KLDR_ERR_BASE + 38)
+/** Duplicate segment name. */
+#define KLDR_ERR_DUPLICATE_SEGMENT_NAME                 (KLDR_ERR_BASE + 39)
 /** @} */
 
@@ -214 +216 @@
  */
 /** The base of the kLdrModPE specific status codes. */
-#define KLDR_ERR_PE_BASE                                (KLDR_ERR_BASE + 39)
+#define KLDR_ERR_PE_BASE                                (KLDR_ERR_BASE + 40)
 /** The machine isn't supported by the interpreter. */
 #define KLDR_ERR_PE_UNSUPPORTED_MACHINE                 (KLDR_ERR_PE_BASE + 0)
@@ -303 +305 @@
 /** Unsupported fixup type. */
 #define KLDR_ERR_MACHO_UNSUPPORTED_FIXUP_TYPE           (KLDR_ERR_MACHO_BASE + 16)
+/** Both debug and non-debug sections in segment. */
+#define KLDR_ERR_MACHO_MIXED_DEBUG_SECTION_FLAGS        (KLDR_ERR_MACHO_BASE + 17)
+/** The segment bits are non-contiguous in the file. */
+#define KLDR_ERR_MACHO_NON_CONT_SEG_BITS                (KLDR_ERR_MACHO_BASE + 18)
 /** @} */
 
@@ -309 +315 @@
  */
 /** The base of the kCpu specific status codes. */
-#define KCPU_ERR_BASE                                   (KLDR_ERR_MACHO_BASE + 18)
+#define KCPU_ERR_BASE                                   (KLDR_ERR_MACHO_BASE + 19)
 /** The specified ARCH+CPU pairs aren't compatible. */
 #define KCPU_ERR_ARCH_CPU_NOT_COMPATIBLE                (KCPU_ERR_BASE + 0)

trunk/include/k/kLdr.h

@@ -366 +366 @@
 
 
+/** @name KLDRMOD::fFlags
+ * @{ */
+/** The link address doesn't form a contiguous image, from the first to the
+ * last segment.   */
+#define KLDRMOD_FLAGS_NON_CONTIGUOUS_LINK_ADDRS         K_BIT32(0)
+/** @} */
+
 /** Pointer to a module interpreter method table. */
 typedef struct KLDRMODOPS *PKLDRMODOPS;
@@ -390 +397 @@
     /** The endian used by the module. */
     KLDRENDIAN          enmEndian;
+    /** Module falgs. */
+    KU32                fFlags;
     /** The filename length (bytes). */
     KU32                cchFilename;