From acf4513e34f0525561e3efbbcb3b1691a35701b9 Mon Sep 17 00:00:00 2001 From: angie Date: Wed, 23 Aug 2023 23:43:18 -0400 Subject: [PATCH] Don't drop the dummy segment if it actually has data on it --- tests/output/oot_gcc.json | 39 +++++++++++++++++++++++++++++++++++++++ tests/output/oot_gcc.sym | 1 + tests/output/w0_000.json | 16 ++++++++++++++++ tests/output/z64.json | 39 +++++++++++++++++++++++++++++++++++++++ tests/output/z64.sym | 1 + 5 files changed, 96 insertions(+) diff --git a/tests/output/oot_gcc.json b/tests/output/oot_gcc.json index 3cf8991..7614695 100644 --- a/tests/output/oot_gcc.json +++ b/tests/output/oot_gcc.json @@ -1,5 +1,44 @@ { "segments": [ + { + "name": "$nosegment", + "vram": "0x00000000", + "size": "0x0", + "vrom": "0x000000", + "files": [ + { + "filepath": "build/src/makerom/rom_header.o", + "sectionType": ".text", + "vram": "0x00000000", + "size": "0x40", + "vrom": "0x000000", + "symbols": [] + }, + { + "filepath": "build/src/makerom/ipl3.o", + "sectionType": ".text", + "vram": "0x00000040", + "size": "0xFC0", + "vrom": "0x000040", + "symbols": [] + }, + { + "filepath": "build/src/makerom/entry.o", + "sectionType": ".text", + "vram": "0x00001000", + "size": "0x60", + "vrom": "0x001000", + "symbols": [ + { + "name": "entrypoint", + "vram": "0x00001000", + "size": "0x60", + "vrom": "0x001000" + } + ] + } + ] + }, { "name": "..boot", "vram": "0x80000460", diff --git a/tests/output/oot_gcc.sym b/tests/output/oot_gcc.sym index 7afcc56..f6eff44 100644 --- a/tests/output/oot_gcc.sym +++ b/tests/output/oot_gcc.sym @@ -1,3 +1,4 @@ +00001000,code,entrypoint 80000460,code,cleararena 80000480,code,bootproc 80000580,code,Main_ThreadEntry diff --git a/tests/output/w0_000.json b/tests/output/w0_000.json index eeefebb..ad82217 100644 --- a/tests/output/w0_000.json +++ b/tests/output/w0_000.json @@ -1,5 +1,21 @@ { "segments": [ + { + "name": "$nosegment", + "vram": "0x00000000", + "size": "0x0", + "vrom": "0x000000", + "files": [ + { + "filepath": "build/us/src/weapon/header.c.o", + "sectionType": ".reginfo", + "vram": "0x00000000", + "size": "0x18", + "vrom": "0x000000", + "symbols": [] + } + ] + }, { "name": ".WEAPON_OVL", "vram": "0x8017A000", diff --git a/tests/output/z64.json b/tests/output/z64.json index fdb40da..0aa6c2d 100644 --- a/tests/output/z64.json +++ b/tests/output/z64.json @@ -1,5 +1,44 @@ { "segments": [ + { + "name": "$nosegment", + "vram": "0x00000000", + "size": "0x0", + "vrom": "0x000000", + "files": [ + { + "filepath": "build/src/makerom/rom_header.o", + "sectionType": ".text", + "vram": "0x00000000", + "size": "0x40", + "vrom": "0x000000", + "symbols": [] + }, + { + "filepath": "build/src/makerom/ipl3.o", + "sectionType": ".text", + "vram": "0x00000040", + "size": "0xFC0", + "vrom": "0x000040", + "symbols": [] + }, + { + "filepath": "build/src/makerom/entry.o", + "sectionType": ".text", + "vram": "0x00001000", + "size": "0x60", + "vrom": "0x001000", + "symbols": [ + { + "name": "entrypoint", + "vram": "0x00001000", + "size": "0x60", + "vrom": "0x001000" + } + ] + } + ] + }, { "name": "..boot", "vram": "0x80000460", diff --git a/tests/output/z64.sym b/tests/output/z64.sym index 3e5c622..d508807 100644 --- a/tests/output/z64.sym +++ b/tests/output/z64.sym @@ -1,3 +1,4 @@ +00001000,code,entrypoint 80000460,code,cleararena 80000498,code,bootproc 800005A0,code,Main_ThreadEntry