@isopodlabs/binary_libs 1.1.0 → 1.1.1

package/README.md

@@ -2,6 +2,8 @@
 
 This package provides readers for various library formats, using the @isopodlabs/binary binary file loading library
 
+## ☕ Support My Work  
+If you use this package, consider [buying me a tea](https://coff.ee/adrianstephens) to support future updates!  
 
 ## Supported File Types
 

package/dist/arch.js

@@ -70,13 +70,13 @@ class ArchFile {
                 const offsets = binary.ArrayType(binary.INT32_BE, binary.INT32_BE).get(s2);
                 member.name = 'Symbols';
                 member.contents = offsets.map(offset => [
-                    binary.NullTerminatedStringType.get(s2),
+                    binary.NullTerminatedStringType().get(s2),
                     offset
                 ]);
             }
             else if (member.name == '/SYM') {
                 const s2 = new binary.stream(data);
-                const syms = binary.ArrayType(binary.INT32_BE, binary.NullTerminatedStringType).get(s2);
+                const syms = binary.ArrayType(binary.INT32_BE, binary.NullTerminatedStringType()).get(s2);
                 member.contents = syms.map(name => ({
                     name,
                     offset: binary.INT32_BE.get(s2)

package/dist/clr.js

@@ -60,7 +60,7 @@ const CLR_HEADER = {
 const STREAM_HDR = {
     Offset: binary.UINT32_LE, // Memory offset to start of this stream from start of the metadata root (§II.24.2.1)
     Size: binary.UINT32_LE, // Size of this stream in bytes, shall be a multiple of 4.
-    Name: binary.NullTerminatedStringType, // Name of the stream as null-terminated variable length array of ASCII characters, padded to the next 4-byte boundary with \0 characters. The name is limited to 32 characters.
+    Name: binary.NullTerminatedStringType(), // Name of the stream as null-terminated variable length array of ASCII characters, padded to the next 4-byte boundary with \0 characters. The name is limited to 32 characters.
     unused: binary.AlignType(4),
 };
 const METADATA_ROOT = {

package/dist/mach.d.ts

@@ -1,8 +1,9 @@
 import * as binary from '@isopodlabs/binary';
 declare class mach_stream extends binary.endianStream {
     base: Uint8Array;
+    memflags: number;
     mem?: binary.memory | undefined;
-    constructor(base: Uint8Array, data: Uint8Array, be: boolean, mem?: binary.memory | undefined);
+    constructor(base: Uint8Array, data: Uint8Array, be: boolean, memflags: number, mem?: binary.memory | undefined);
     subdata(offset: number, size?: number): Uint8Array;
     substream(offset: number, size?: number): mach_stream;
     getmem(address: bigint, size: number): Uint8Array | Promise<Uint8Array> | undefined;
@@ -82,10 +83,10 @@ declare const cmd_table: {
         get(s: mach_stream): {
             data: binary.MappedMemory | undefined;
             segname: string;
-            vmaddr: number;
-            vmsize: number;
-            fileoff: number;
-            filesize: number;
+            vmaddr: binary.hex<number | bigint>;
+            vmsize: binary.hex<number | bigint>;
+            fileoff: binary.hex<number | bigint>;
+            filesize: binary.hex<number | bigint>;
             maxprot: number;
             initprot: number;
             nsects: number;
@@ -97,10 +98,10 @@ declare const cmd_table: {
         get(s: mach_stream): {
             data: binary.MappedMemory | undefined;
             segname: string;
-            vmaddr: bigint;
-            vmsize: bigint;
-            fileoff: bigint;
-            filesize: bigint;
+            vmaddr: binary.hex<number | bigint>;
+            vmsize: binary.hex<number | bigint>;
+            fileoff: binary.hex<number | bigint>;
+            filesize: binary.hex<number | bigint>;
             maxprot: number;
             initprot: number;
             nsects: number;
@@ -481,22 +482,10 @@ export declare class MachFile {
     getSegment(name: string): {
         data: binary.MappedMemory | undefined;
         segname: string;
-        vmaddr: number;
-        vmsize: number;
-        fileoff: number;
-        filesize: number;
-        maxprot: number;
-        initprot: number;
-        nsects: number;
-        flags: Record<string, bigint | boolean> | Record<string, number | boolean>;
-        sections: Record<string, any> | undefined;
-    } | {
-        data: binary.MappedMemory | undefined;
-        segname: string;
-        vmaddr: bigint;
-        vmsize: bigint;
-        fileoff: bigint;
-        filesize: bigint;
+        vmaddr: binary.hex<number | bigint>;
+        vmsize: binary.hex<number | bigint>;
+        fileoff: binary.hex<number | bigint>;
+        filesize: binary.hex<number | bigint>;
         maxprot: number;
         initprot: number;
         nsects: number;

package/dist/mach.js

@@ -27,17 +27,19 @@ exports.FATMachFile = exports.MachFile = exports.CMD = void 0;
 const binary = __importStar(require("@isopodlabs/binary"));
 class mach_stream extends binary.endianStream {
     base;
+    memflags;
     mem;
-    constructor(base, data, be, mem) {
+    constructor(base, data, be, memflags, mem) {
         super(data, be);
         this.base = base;
+        this.memflags = memflags;
         this.mem = mem;
     }
     subdata(offset, size) {
         return this.base.subarray(offset, size && offset + size);
     }
     substream(offset, size) {
-        return new mach_stream(this.base, this.subdata(offset, size), this.be, this.mem);
+        return new mach_stream(this.base, this.subdata(offset, size), this.be, this.memflags, this.mem);
     }
     getmem(address, size) {
         return this.mem?.get(address, size);
@@ -405,7 +407,7 @@ const SECTION_FLAGS = binary.BitFields({
         })],
 });
 function section(bits) {
-    const type = binary.UINT(bits);
+    const type = binary.asHex(binary.UINT(bits));
     class Section extends binary.Class({
         //data:		binary.DontRead<binary.utils.MappedMemory>(),
         sectname: fixed_string16,
@@ -424,7 +426,7 @@ function section(bits) {
         data;
         constructor(s) {
             super(s);
-            const prot = this.flags.ATTRIBUTES.SYS.SOME_INSTRUCTIONS ? binary.MappedMemory.EXECUTE | binary.MappedMemory.RELATIVE : binary.MappedMemory.RELATIVE;
+            const prot = this.flags.ATTRIBUTES.SYS.SOME_INSTRUCTIONS ? binary.MappedMemory.EXECUTE | s.memflags : s.memflags;
             this.data = (async () => 
             //new binary.utils.MappedMemory(await s.file.get(BigInt(this.addr), Number(this.size)), Number(this.addr), prot)
             new binary.MappedMemory(s.subdata(+this.offset, Number(this.size)), Number(this.addr), prot))();
@@ -439,7 +441,7 @@ const SEGMENT_FLAGS = {
     PROTECTED_VERSION_1: 0x8, // This segment is protected.	If the segment starts at file offset 0, the first page of the segment is not protected.	All other pages of the segment are protected.
 };
 function segment(bits) {
-    const type = binary.UINT(bits);
+    const type = binary.asHex(binary.UINT(bits));
     const fields = {
         data: binary.DontRead(),
         segname: fixed_string16, // segment name
@@ -458,7 +460,7 @@ function segment(bits) {
             const o = binary.read(s, fields);
             async function load() {
                 const data = await s.getmem(BigInt(Number(o.vmaddr)), Number(o.filesize)) ?? s.subdata(Number(o.fileoff), Number(o.filesize));
-                o.data = new binary.MappedMemory(data, Number(o.vmaddr), o.initprot | binary.MappedMemory.RELATIVE);
+                o.data = new binary.MappedMemory(data, Number(o.vmaddr), o.initprot | s.memflags);
                 //const sect = section(bits);
                 if (o.nsects) {
                     o.sections = binary.objectWithNames(binary.ArrayType(o.nsects, section(bits)), binary.field('sectname')).get(s);
@@ -1006,7 +1008,7 @@ class MachFile {
             file.skip(4);
         for (let i = 0; i < h.ncmds; ++i) {
             const cmd = binary.read(file, command);
-            const file2 = new mach_stream(data, file.read_buffer(cmd.cmdsize - 8), file.be, mem);
+            const file2 = new mach_stream(data, file.read_buffer(cmd.cmdsize - 8), file.be, h.filetype === 'EXECUTE' ? 0 : binary.MappedMemory.RELATIVE, mem);
             const result = binary.read(file2, cmd_table[cmd.cmd] ?? {});
             this.commands.push({ cmd: cmd.cmd, data: result });
         }
@@ -1015,7 +1017,7 @@ class MachFile {
         if (funcs) {
             const array = funcs.contents;
             const text = this.getSegment('__TEXT');
-            let acc = BigInt(text?.vmaddr ?? 0);
+            let acc = BigInt(text?.vmaddr.value ?? 0);
             for (const i in array)
                 array[i] = (acc += BigInt(array[i]));
         }

package/package.json

@@ -41,5 +41,5 @@
   "dependencies": {
     "@isopodlabs/binary": "^1.4.0"
   },
-  "version": "1.1.0"
+  "version": "1.1.1"
 }