@isopodlabs/binary_libs 0.2.3 → 1.0.1

package/dist/elf.js

@@ -41,7 +41,7 @@ const OSABI = {
     HPUX: 1, // HP-UX operating system
     STANDALONE: 255, // Standalone (embedded)application
 };
-const Ident = binary.SizeType(16, {
+const Ident = {
     //enum {MAGIC = '\177ELF'};
     magic: binary.UINT32_LE,
     file_class: binary.asEnum(binary.UINT8, CLASS),
@@ -53,7 +53,7 @@ const Ident = binary.SizeType(16, {
         abiversion: binary.UINT8,
         pad: binary.ArrayType(7, binary.UINT8),
     })
-});
+};
 const ET = {
     NONE: 0, // No file type
     REL: 1, // Relocatable file
@@ -679,10 +679,10 @@ class ELFFile {
             data;
             constructor(s) {
                 super(s);
-                const flags = (this.p_flags.R ? binary.MappedMemory.READ : 0)
-                    | (this.p_flags.W ? binary.MappedMemory.WRITE : 0)
-                    | (this.p_flags.X ? binary.MappedMemory.EXECUTE : 0);
-                this.data = new binary.MappedMemory(s.buffer_at(Number(this.p_offset), Number(this.p_filesz)), +this.p_vaddr, flags);
+                const flags = (this.p_flags.R ? 1 /* binary.MEM.READ */ : 0)
+                    | (this.p_flags.W ? 2 /* binary.MEM.WRITE */ : 0)
+                    | (this.p_flags.X ? 4 /* binary.MEM.EXECUTE */ : 0);
+                this.data = new binary.MappedMemory(s.buffer_at(Number(this.p_offset), Number(this.p_filesz)), Number(this.p_vaddr), flags);
             }
         }
         class Shdr extends binary.ReadClass({
@@ -700,10 +700,10 @@ class ELFFile {
             data;
             constructor(s) {
                 super(s);
-                const flags = binary.MappedMemory.READ
-                    | (this.sh_flags.WRITE ? binary.MappedMemory.WRITE : 0)
-                    | (this.sh_flags.EXECINSTR ? binary.MappedMemory.EXECUTE : 0);
-                this.data = new binary.MappedMemory(s.buffer_at(Number(this.sh_offset), Number(this.sh_size)), +this.sh_addr, flags);
+                const flags = 1 /* binary.MEM.READ */
+                    | (this.sh_flags.WRITE ? 2 /* binary.MEM.WRITE */ : 0)
+                    | (this.sh_flags.EXECINSTR ? 4 /* binary.MEM.EXECUTE */ : 0);
+                this.data = new binary.MappedMemory(s.buffer_at(Number(this.sh_offset), Number(this.sh_size)), Number(this.sh_addr), flags);
             }
         }
         const h = binary.read(s, Ehdr);
@@ -721,10 +721,9 @@ class ELFFile {
             d_tag: binary.asEnum(Sword, DT_TAG),
             d_val: Xword,
         };
-        const reloc = RELOC[h.e_machine];
         const Rel = {
             r_offset: Addr,
-            r_info: Pair(reloc ? binary.asEnum(PairHalf, reloc) : PairHalf, PairHalf, be),
+            r_info: Pair(binary.asEnum(PairHalf, RELOC[h.e_machine]), PairHalf, be),
         };
         const Rela = {
             ...Rel,
@@ -759,7 +758,7 @@ class ELFFile {
                     if (+sym.st_shndx) {
                         const section = sh[+sym.st_shndx];
                         const offset = Number(sym.st_value.value) - Number(section.sh_addr.value);
-                        const flags = sym.st_info.type === 'FUNC' ? section.data.flags : section.data.flags & ~binary.MappedMemory.EXECUTE;
+                        const flags = sym.st_info.type === 'FUNC' ? section.data.flags : section.data.flags & ~4 /* binary.MEM.EXECUTE */;
                         sym.data = new binary.MappedMemory(section.data.data.subarray(offset, offset + Number(sym.st_size)), Number(sym.st_value.value), flags);
                     }
                     return [binary.utils.decodeTextTo0(names.subarray(sym.st_name), 'utf8'), sym];

package/dist/mach.d.ts

@@ -508,5 +508,6 @@ export declare class FATMachFile {
     archs: binary.ReadType<typeof fat_arch>[];
     static check(data: Uint8Array): boolean;
     constructor(data: Uint8Array, mem?: binary.memory);
+    load(file: binary.endianStream, mem?: binary.memory): void;
 }
 export {};

package/dist/mach.js

@@ -424,7 +424,7 @@ function section(bits) {
         data;
         constructor(s) {
             super(s);
-            const prot = this.flags.ATTRIBUTES.SYS.SOME_INSTRUCTIONS ? binary.MappedMemory.EXECUTE : binary.MappedMemory.NONE;
+            const prot = this.flags.ATTRIBUTES.SYS.SOME_INSTRUCTIONS ? 4 /* binary.MEM.EXECUTE */ : 0 /* binary.MEM.NONE */;
             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))();
@@ -1038,31 +1038,10 @@ class MachFile {
 }
 exports.MachFile = MachFile;
 const FAT_MAGIC = 0xcafebabe;
+const FAT_CIGAM = 0xbebafeca;
 class FATMachFile {
     archs = [];
     static check(data) {
-        return binary.UINT32_BE.get(new binary.stream(data)) === FAT_MAGIC;
-    }
-    constructor(data, mem) {
-        const file = new binary.endianStream(data, true);
-        const header = binary.read(file, fat_header);
-        this.archs = header.archs;
-        for (const arch of header.archs) {
-            const cpu = CPU_TYPE[arch.cputype];
-            const data = file.buffer_at(arch.offset, arch.size);
-            arch.cpusubtype = binary.Enum(CPU_SUBTYPES[cpu])(+arch.cpusubtype);
-            arch.contents = new MachFile(data, mem);
-        }
-    }
-}
-exports.FATMachFile = FATMachFile;
-/*
-const FAT_CIGAM		= 0xbebafeca;
-
-export class FATMachFile {
-    archs:	binary.ReadType<typeof fat_arch>[] = [];
-
-    static check(data: Uint8Array): boolean {
         switch (binary.UINT32_BE.get(new binary.stream(data))) {
             case FAT_MAGIC:
             case FAT_CIGAM:
@@ -1071,26 +1050,33 @@ export class FATMachFile {
                 return false;
         }
     }
-    
-    constructor(data: Uint8Array, mem?: binary.memory) {
+    constructor(data, mem) {
         switch (binary.UINT32_BE.get(new binary.stream(data))) {
-            case FAT_MAGIC:		this.load(new binary.endianStream(data, false), mem); break;
-            case FAT_CIGAM:		this.load(new binary.endianStream(data, true), mem); break;
+            case FAT_MAGIC:
+                this.load(new binary.endianStream(data, false), mem);
+                break;
+            case FAT_CIGAM:
+                this.load(new binary.endianStream(data, true), mem);
+                break;
             default:
                 throw new Error('not a fat mach file');
         }
     }
-
-    load(file: binary.endianStream, mem?: binary.memory) {
+    load(file, mem) {
         const header = binary.read(file, fat_header);
         this.archs = header.archs;
         for (const arch of header.archs) {
-            const cpu	= CPU_TYPE[arch.cputype as keyof typeof CPU_TYPE];
-            const data	= file.buffer_at(arch.offset, arch. size);
+            const cpu = CPU_TYPE[arch.cputype];
+            const data = file.buffer_at(arch.offset, arch.size);
             arch.cpusubtype = binary.Enum(CPU_SUBTYPES[cpu])(+arch.cpusubtype);
-            arch.contents	= new MachFile(data, mem);
+            arch.contents = new MachFile(data, mem);
         }
     }
 }
-
+exports.FATMachFile = FATMachFile;
+/*
+export function freestanding<T extends CMD>(s: binary.stream, cmd: T) : binary.ReadType<typeof cmd_table[T]>;
+export function freestanding(s: binary.stream, cmd: CMD) {
+    return binary.read(s, cmd_table[cmd]);
+}
 */ 

package/dist/pe.js

@@ -167,10 +167,10 @@ class Section extends binary.ReadClass({
         }
     }
     get flags() {
-        return binary.MappedMemory.RELATIVE
-            | (this.Characteristics.MEM_READ ? binary.MappedMemory.READ : 0)
-            | (this.Characteristics.MEM_WRITE ? binary.MappedMemory.WRITE : 0)
-            | (this.Characteristics.MEM_EXECUTE ? binary.MappedMemory.EXECUTE : 0);
+        return 8 /* binary.MEM.RELATIVE */
+            | (this.Characteristics.MEM_READ ? 1 /* binary.MEM.READ */ : 0)
+            | (this.Characteristics.MEM_WRITE ? 2 /* binary.MEM.WRITE */ : 0)
+            | (this.Characteristics.MEM_EXECUTE ? 4 /* binary.MEM.EXECUTE */ : 0);
     }
 }
 exports.DIRECTORIES = {

package/package.json

@@ -38,8 +38,8 @@
     "typescript": "~5.5.0",
     "typescript-eslint": "^8.26.0"
   },
-  "version": "0.2.3",
   "dependencies": {
-    "@isopodlabs/binary": "^1.3.4"
-  }
+    "@isopodlabs/binary": "^1.0.3"
+  },
+  "version": "1.0.1"
 }