diff --git a/macho/architecture.test.ts b/macho/architecture.test.ts index 655f5bf..f60e75b 100644 --- a/macho/architecture.test.ts +++ b/macho/architecture.test.ts @@ -13,21 +13,21 @@ import { Architecture } from './architecture.ts'; Deno.test('constructor()', () => { const a = new Architecture(); assertEquals(a.cpuType(), 0); - assertEquals(a.cpuSubType(), 0); + assertEquals(a.cpuSubtype(), 0); assertEquals(a.cpuSubtypeFull(), 0); }); Deno.test('constructor(type)', () => { const a = new Architecture(0x12345678); assertEquals(a.cpuType(), 0x12345678); - assertEquals(a.cpuSubType(), 0xffffff); + assertEquals(a.cpuSubtype(), 0xffffff); assertEquals(a.cpuSubtypeFull(), -1); }); Deno.test('constructor(type, sub)', () => { const a = new Architecture(0x12345678, 0x23456789); assertEquals(a.cpuType(), 0x12345678); - assertEquals(a.cpuSubType(), 0x456789); + assertEquals(a.cpuSubtype(), 0x456789); assertEquals(a.cpuSubtypeFull(), 0x23456789); }); @@ -37,7 +37,7 @@ Deno.test('constructor(archInFile: FatArch)', () => { f.cpusubtype = 0x23456789; const a = new Architecture(f); assertEquals(a.cpuType(), 0x12345678); - assertEquals(a.cpuSubType(), 0x456789); + assertEquals(a.cpuSubtype(), 0x456789); assertEquals(a.cpuSubtypeFull(), 0x23456789); }); @@ -47,7 +47,7 @@ Deno.test('constructor(archInFile: FatArch64)', () => { f.cpusubtype = 0x23456789; const a = new Architecture(f); assertEquals(a.cpuType(), 0x12345678); - assertEquals(a.cpuSubType(), 0x456789); + assertEquals(a.cpuSubtype(), 0x456789); assertEquals(a.cpuSubtypeFull(), 0x23456789); }); diff --git a/macho/architecture.ts b/macho/architecture.ts index d7adfe4..e70d60a 100644 --- a/macho/architecture.ts +++ b/macho/architecture.ts @@ -75,7 +75,7 @@ export class Architecture { * * @returns Masked subtype ID. */ - public cpuSubType(): number { + public cpuSubtype(): number { return this.second & ~CPU_SUBTYPE_MASK; } diff --git a/macho/machobase.test.ts b/macho/machobase.test.ts index e14c5da..900a67d 100644 --- a/macho/machobase.test.ts +++ b/macho/machobase.test.ts @@ -189,7 +189,7 @@ Deno.test('init', () => { assertEquals(macho.isFlipped(), flip, tag); assertEquals(macho.is64(), bits === 64, tag); assertEquals(macho.architecture().cpuType(), 2, tag); - assertEquals(macho.architecture().cpuSubType(), 3, tag); + assertEquals(macho.architecture().cpuSubtype(), 3, tag); assertEquals(macho.type(), 4, tag); assertEquals(macho.flags(), 5, tag); assertEquals(macho.headerSize(), header.byteLength, tag);