ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix test setup, first slab of linker tests.

This commit is contained in:
Christian Speckner 2024-07-13 23:30:21 +02:00
parent 4d722c4622
commit 428d36943e
24 changed files with 292 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -26,6 +26,7 @@ LDFLAGS := -pthread
INCLUDES :=
LIBS :=
OBJS :=
OBJS_TEST :=
PROF :=
MODULES :=

2
common.rules
View File

@ -9,4 +9,4 @@ MODULE_TEST_OBJS-$(MODULE) := $(MODULE_TEST_OBJS)
# If not building as a plugin, add the object files to the main OBJS list
#OBJS += $(MODULE_LIB-$(MODULE))
OBJS += $(MODULE_OBJS)
OBJS_TEST := $(MODULE_TEST_OBJS)
OBJS_TEST += $(MODULE_TEST_OBJS)

4
src/cheat/module.mk
View File

@ -7,8 +7,10 @@ MODULE_OBJS := \
src/cheat/BankRomCheat.o \
src/cheat/RamCheat.o
MODULE_TEST_OBJS =
MODULE_DIRS += \
src/cheat
# Include common rules
# Include common rules
include $(srcdir)/common.rules

2
src/common/audio/module.mk
View File

@ -6,6 +6,8 @@ MODULE_OBJS := \
src/common/audio/LanczosResampler.o \
src/common/audio/HighPass.o
MODULE_TEST_OBJS =
MODULE_DIRS += \
src/emucore/tia \
src/emucore/elf

5
src/common/module.mk
View File

@ -4,7 +4,7 @@ MODULE_OBJS := \
src/common/AudioQueue.o \
src/common/AudioSettings.o \
src/common/Base.o \
src/common/Bezel.o \
src/common/Bezel.o \
src/common/DevSettingsHandler.o \
src/common/EventHandlerSDL2.o \
src/common/FBBackendSDL2.o \
@ -41,6 +41,9 @@ MODULE_OBJS := \
src/common/repository/CompositeKVRJsonAdapter.o \
src/common/repository/CompositeKeyValueRepository.o
MODULE_TEST_OBJS = \
src/common/Logger.o
MODULE_DIRS += \
src/common

2
src/common/repository/sqlite/module.mk
View File

@ -9,6 +9,8 @@ MODULE_OBJS := \
src/common/repository/sqlite/SqliteStatement.o \
src/common/repository/sqlite/SqliteTransaction.o
MODULE_TEST_OBJS =
MODULE_DIRS += \
src/common/repository/sqlite

2
src/common/tv_filters/module.mk
View File

@ -4,6 +4,8 @@ MODULE_OBJS := \
src/common/tv_filters/NTSCFilter.o \
src/common/tv_filters/AtariNTSC.o
MODULE_TEST_OBJS =
MODULE_DIRS += \
src/common/tv_filters

2
src/debugger/gui/module.mk
View File

@ -90,6 +90,8 @@ MODULE_OBJS := \
src/debugger/gui/ToggleWidget.o \
src/debugger/gui/TrakBallWidget.o
MODULE_TEST_OBJS =
MODULE_DIRS += \
src/debugger/gui

2
src/debugger/module.mk
View File

@ -11,6 +11,8 @@ MODULE_OBJS := \
src/debugger/TIADebug.o \
src/debugger/TimerMap.o
MODULE_TEST_OBJS =
MODULE_DIRS += \
src/debugger

2
src/debugger/yacc/module.mk
View File

@ -3,6 +3,8 @@ MODULE := src/debugger/yacc
MODULE_OBJS := \
src/debugger/yacc/YaccParser.o
MODULE_TEST_OBJS =
MODULE_DIRS += \
src/debugger/yacc

2
src/emucore/elf/ElfParser.cxx
View File

@ -129,7 +129,7 @@ const vector<ElfParser::Symbol>& ElfParser::getSymbols() const
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
const optional<vector<ElfParser::Relocation>> ElfParser::getRelocations(size_t section) const
{
return myRelocations.contains(section) ? myRelocations.at(section) : optional<vector<ElfParser::Relocation>>();
return myRelocations.contains(section) ? myRelocations.at(section) : optional<vector<Relocation>>();
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

244
src/emucore/elf/LinkerTest.cxx Normal file
View File

@ -0,0 +1,244 @@
//============================================================================
//
// SSSS tt lll lll
// SS SS tt ll ll
// SS tttttt eeee ll ll aaaa
// SSSS tt ee ee ll ll aa
// SS tt eeeeee ll ll aaaaa -- "An Atari 2600 VCS Emulator"
// SS SS tt ee ll ll aa aa
// SSSS ttt eeeee llll llll aaaaa
//
// Copyright (c) 1995-2024 by Bradford W. Mott, Stephen Anthony
// and the Stella Team
//
// See the file "License.txt" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//============================================================================
#include <gtest/gtest.h>
#include <unordered_map>
#include "bspf.hxx"
#include "ElfFile.hxx"
#include "ElfLinker.hxx"
namespace {
class ElfFixture: public ElfFile {
public:
explicit ElfFixture(size_t size) : mySize(size) {
myData = make_unique<uInt8[]>(mySize);
}
const uInt8 *getData() const override {
return myData.get();
}
size_t getSize() const override {
return mySize;
}
const vector<Section>& getSections() const override {
return mySections;
}
const vector<Symbol>& getSymbols() const override {
return mySymbols;
}
const optional<vector<Relocation>> getRelocations(size_t section) const override {
return myRelocations.contains(section) ? myRelocations.at(section) : optional<vector<Relocation>>();
}
ElfFixture& addSection(string_view name, uInt32 type, uInt32 offset, uInt32 size, uInt32 align = 4) {
mySections.push_back({
.nameOffset = 0,
.name = string(name),
.type = type,
.flags = 0,
.virtualAddress = 0,
.offset = offset,
.size = size,
.info = 0,
.align = align
});
return *this;
}
ElfFixture& write8(size_t address, uInt8 value) {
myData[address] = value;
return *this;
}
public:
size_t mySize;
unique_ptr<uInt8[]> myData;
vector<Section> mySections;
vector<Symbol> mySymbols;
std::unordered_map<size_t, vector<Relocation>> myRelocations;
};
TEST(ElfLinker, HasEmptySegmentsForAnEmptyELF) {
ElfFixture fixture(0);
ElfLinker linker(0x00100000, 0x00200000, 0x00300000, fixture);
linker.link({});
EXPECT_EQ(linker.getSegmentSize(ElfLinker::SegmentType::text), static_cast<uInt32>(0));
EXPECT_EQ(linker.getSegmentSize(ElfLinker::SegmentType::data), static_cast<uInt32>(0));
EXPECT_EQ(linker.getSegmentSize(ElfLinker::SegmentType::rodata), static_cast<uInt32>(0));
}
TEST(ElfLinker, TextSegmentsGoToText) {
ElfFixture fixture(1000);
ElfLinker linker(0x00100000, 0x00200000, 0x00300000, fixture);
fixture
.addSection(".text.1", ElfFile::SHT_PROGBITS, 0, 10, 4)
.write8(0, 0x01)
.addSection(".text.2", ElfFile::SHT_PROGBITS, 10, 21, 4)
.write8(10, 0x02)
.addSection(".text.3", ElfFile::SHT_PROGBITS, 31, 33, 2)
.write8(31, 0x03)
.addSection(".text.4", ElfFile::SHT_PROGBITS, 64, 11, 1)
.write8(64, 0x04);
linker.link({});
EXPECT_EQ(linker.getSegmentSize(ElfLinker::SegmentType::text), static_cast<uInt32>(78));
EXPECT_EQ(linker.getSegmentSize(ElfLinker::SegmentType::data), static_cast<uInt32>(0));
EXPECT_EQ(linker.getSegmentSize(ElfLinker::SegmentType::rodata), static_cast<uInt32>(0));
EXPECT_EQ(linker.getRelocatedSections()[0]->offset, static_cast<uInt32>(0));
EXPECT_EQ(linker.getRelocatedSections()[0]->segment, ElfLinker::SegmentType::text);
EXPECT_EQ(linker.getRelocatedSections()[1]->offset, static_cast<uInt32>(12));
EXPECT_EQ(linker.getRelocatedSections()[1]->segment, ElfLinker::SegmentType::text);
EXPECT_EQ(linker.getRelocatedSections()[2]->offset, static_cast<uInt32>(34));
EXPECT_EQ(linker.getRelocatedSections()[2]->segment, ElfLinker::SegmentType::text);
EXPECT_EQ(linker.getRelocatedSections()[3]->offset, static_cast<uInt32>(67));
EXPECT_EQ(linker.getRelocatedSections()[3]->segment, ElfLinker::SegmentType::text);
EXPECT_EQ(linker.getSegmentData(ElfLinker::SegmentType::text)[0], 0x01);
EXPECT_EQ(linker.getSegmentData(ElfLinker::SegmentType::text)[12], 0x02);
EXPECT_EQ(linker.getSegmentData(ElfLinker::SegmentType::text)[34], 0x03);
EXPECT_EQ(linker.getSegmentData(ElfLinker::SegmentType::text)[67], 0x04);
}
TEST(ElfLinker, DataSegmentsGoToData) {
ElfFixture fixture(1000);
ElfLinker linker(0x00100000, 0x00200000, 0x00300000, fixture);
fixture
.addSection(".data.1", ElfFile::SHT_PROGBITS, 0, 10, 4)
.write8(0, 0x01)
.addSection(".data.2", ElfFile::SHT_PROGBITS, 10, 21, 4)
.write8(10, 0x02)
.addSection(".data.3", ElfFile::SHT_PROGBITS, 31, 33, 2)
.write8(31, 0x03)
.addSection(".data.4", ElfFile::SHT_PROGBITS, 64, 11, 1)
.write8(64, 0x04);
linker.link({});
EXPECT_EQ(linker.getSegmentSize(ElfLinker::SegmentType::text), static_cast<uInt32>(0));
EXPECT_EQ(linker.getSegmentSize(ElfLinker::SegmentType::data), static_cast<uInt32>(78));
EXPECT_EQ(linker.getSegmentSize(ElfLinker::SegmentType::rodata), static_cast<uInt32>(0));
EXPECT_EQ(linker.getRelocatedSections()[0]->offset, static_cast<uInt32>(0));
EXPECT_EQ(linker.getRelocatedSections()[0]->segment, ElfLinker::SegmentType::data);
EXPECT_EQ(linker.getRelocatedSections()[1]->offset, static_cast<uInt32>(12));
EXPECT_EQ(linker.getRelocatedSections()[1]->segment, ElfLinker::SegmentType::data);
EXPECT_EQ(linker.getRelocatedSections()[2]->offset, static_cast<uInt32>(34));
EXPECT_EQ(linker.getRelocatedSections()[2]->segment, ElfLinker::SegmentType::data);
EXPECT_EQ(linker.getRelocatedSections()[3]->offset, static_cast<uInt32>(67));
EXPECT_EQ(linker.getRelocatedSections()[3]->segment, ElfLinker::SegmentType::data);
EXPECT_EQ(linker.getSegmentData(ElfLinker::SegmentType::data)[0], 0x01);
EXPECT_EQ(linker.getSegmentData(ElfLinker::SegmentType::data)[12], 0x02);
EXPECT_EQ(linker.getSegmentData(ElfLinker::SegmentType::data)[34], 0x03);
EXPECT_EQ(linker.getSegmentData(ElfLinker::SegmentType::data)[67], 0x04);
}
TEST(ElfLinker, RodataSegmentsGoToRodata) {
ElfFixture fixture(1000);
ElfLinker linker(0x00100000, 0x00200000, 0x00300000, fixture);
fixture
.addSection(".rodata.1", ElfFile::SHT_PROGBITS, 0, 10, 4)
.write8(0, 0x01)
.addSection(".rodata.2", ElfFile::SHT_PROGBITS, 10, 21, 4)
.write8(10, 0x02)
.addSection(".rodata.3", ElfFile::SHT_PROGBITS, 31, 33, 2)
.write8(31, 0x03)
.addSection(".rodata.4", ElfFile::SHT_PROGBITS, 64, 11, 1)
.write8(64, 0x04);
linker.link({});
EXPECT_EQ(linker.getSegmentSize(ElfLinker::SegmentType::text), static_cast<uInt32>(0));
EXPECT_EQ(linker.getSegmentSize(ElfLinker::SegmentType::data), static_cast<uInt32>(0));
EXPECT_EQ(linker.getSegmentSize(ElfLinker::SegmentType::rodata), static_cast<uInt32>(78));
EXPECT_EQ(linker.getRelocatedSections()[0]->offset, static_cast<uInt32>(0));
EXPECT_EQ(linker.getRelocatedSections()[0]->segment, ElfLinker::SegmentType::rodata);
EXPECT_EQ(linker.getRelocatedSections()[1]->offset, static_cast<uInt32>(12));
EXPECT_EQ(linker.getRelocatedSections()[1]->segment, ElfLinker::SegmentType::rodata);
EXPECT_EQ(linker.getRelocatedSections()[2]->offset, static_cast<uInt32>(34));
EXPECT_EQ(linker.getRelocatedSections()[2]->segment, ElfLinker::SegmentType::rodata);
EXPECT_EQ(linker.getRelocatedSections()[3]->offset, static_cast<uInt32>(67));
EXPECT_EQ(linker.getRelocatedSections()[3]->segment, ElfLinker::SegmentType::rodata);
EXPECT_EQ(linker.getSegmentData(ElfLinker::SegmentType::rodata)[0], 0x01);
EXPECT_EQ(linker.getSegmentData(ElfLinker::SegmentType::rodata)[12], 0x02);
EXPECT_EQ(linker.getSegmentData(ElfLinker::SegmentType::rodata)[34], 0x03);
EXPECT_EQ(linker.getSegmentData(ElfLinker::SegmentType::rodata)[67], 0x04);
}
TEST(ElfLinker, BssSectionsGoToTheEndOfData) {
ElfFixture fixture(1000);
ElfLinker linker(0x00100000, 0x00200000, 0x00300000, fixture);
fixture
.addSection(".data.1", ElfFile::SHT_PROGBITS, 0, 10, 4)
.write8(0, 0x01)
.addSection(".bss", ElfFile::SHT_NOBITS, 0, 21, 4)
.addSection(".data.2", ElfFile::SHT_PROGBITS, 10, 33, 2)
.write8(10, 0x02)
.addSection(".noinit", ElfFile::SHT_NOBITS, 0, 11, 1);
linker.link({});
EXPECT_EQ(linker.getSegmentSize(ElfLinker::SegmentType::text), static_cast<uInt32>(0));
EXPECT_EQ(linker.getSegmentSize(ElfLinker::SegmentType::data), static_cast<uInt32>(76));
EXPECT_EQ(linker.getSegmentSize(ElfLinker::SegmentType::rodata), static_cast<uInt32>(0));
EXPECT_EQ(linker.getRelocatedSections()[0]->offset, static_cast<uInt32>(0));
EXPECT_EQ(linker.getRelocatedSections()[0]->segment, ElfLinker::SegmentType::data);
EXPECT_EQ(linker.getRelocatedSections()[1]->offset, static_cast<uInt32>(44));
EXPECT_EQ(linker.getRelocatedSections()[1]->segment, ElfLinker::SegmentType::data);
EXPECT_EQ(linker.getRelocatedSections()[2]->offset, static_cast<uInt32>(10));
EXPECT_EQ(linker.getRelocatedSections()[2]->segment, ElfLinker::SegmentType::data);
EXPECT_EQ(linker.getRelocatedSections()[3]->offset, static_cast<uInt32>(65));
EXPECT_EQ(linker.getRelocatedSections()[3]->segment, ElfLinker::SegmentType::data);
EXPECT_EQ(linker.getSegmentData(ElfLinker::SegmentType::data)[0], 0x01);
EXPECT_EQ(linker.getSegmentData(ElfLinker::SegmentType::data)[10], 0x02);
EXPECT_EQ(linker.getSegmentData(ElfLinker::SegmentType::data)[44], 0);
EXPECT_EQ(linker.getSegmentData(ElfLinker::SegmentType::data)[65], 0);
}
}

6
src/emucore/elf/module.mk
View File

@ -8,10 +8,12 @@ MODULE_OBJS = \
MODULE_TEST_OBJS = \
src/emucore/elf/ElfUtil.o \
src/emucore/elf/EncodingTest.o
src/emucore/elf/ElfLinker.o \
src/emucore/elf/EncodingTest.o \
src/emucore/elf/LinkerTest.o
MODULE_DIRS += \
src/emucore/elf/EncodingTest.o
src/emucore/elf
# Include common rules
include $(srcdir)/common.rules

2
src/emucore/module.mk
View File

@ -99,6 +99,8 @@ MODULE_OBJS := \
src/emucore/TIASurface.o \
src/emucore/Thumbulator.o
MODULE_TEST_OBJS =
MODULE_DIRS += \
src/emucore

2
src/emucore/tia/frame-manager/module.mk
View File

@ -6,6 +6,8 @@ MODULE_OBJS := \
src/emucore/tia/frame-manager/FrameLayoutDetector.o \
src/emucore/tia/frame-manager/JitterEmulation.o
MODULE_TEST_OBJS =
MODULE_DIRS += \
src/emucore/tia/frame-manager

2
src/emucore/tia/module.mk
View File

@ -13,6 +13,8 @@ MODULE_OBJS := \
src/emucore/tia/Audio.o \
src/emucore/tia/AudioChannel.o
MODULE_TEST_OBJS =
MODULE_DIRS += \
src/emucore/tia

2
src/gui/module.mk
View File

@ -64,6 +64,8 @@ MODULE_OBJS := \
src/gui/WhatsNewDialog.o \
src/gui/Widget.o
MODULE_TEST_OBJS =
MODULE_DIRS += \
src/gui

2
src/lib/libpng/module.mk
View File

@ -17,6 +17,8 @@ MODULE_OBJS := \
src/lib/libpng/pngwtran.o \
src/lib/libpng/pngwutil.o
MODULE_TEST_OBJS =
MODULE_DIRS += \
src/lib/libpng

2
src/lib/sqlite/module.mk
View File

@ -3,6 +3,8 @@ MODULE := src/lib/sqlite
MODULE_OBJS := \
src/lib/sqlite/sqlite3.o
MODULE_TEST_OBJS =
MODULE_DIRS += \
src/lib/sqlite

2
src/lib/tinyexif/module.mk
View File

@ -3,6 +3,8 @@ MODULE := src/lib/tinyexif
MODULE_OBJS := \
src/lib/tinyexif/tinyexif.o
MODULE_TEST_OBJS =
MODULE_DIRS += \
src/lib/tinyexif

2
src/lib/zlib/module.mk
View File

@ -17,6 +17,8 @@ MODULE_OBJS := \
src/lib/zlib/inftrees.o \
src/lib/zlib/inffast.o
MODULE_TEST_OBJS =
MODULE_DIRS += \
src/lib/zlib

2
src/os/unix/module.mk
View File

@ -5,6 +5,8 @@ MODULE_OBJS := \
src/os/unix/OSystemUNIX.o \
src/os/unix/SerialPortUNIX.o
MODULE_TEST_OBJS =
MODULE_DIRS += \
src/os/unix

2
src/os/unix/r77/module.mk
View File

@ -4,6 +4,8 @@ MODULE_OBJS := \
src/os/unix/r77/OSystemR77.o \
src/os/unix/r77/SettingsR77.o
MODULE_TEST_OBJS =
MODULE_DIRS += \
src/os/unix/r77

2
src/os/windows/module.mk
View File

@ -7,6 +7,8 @@ MODULE_OBJS := \
src/os/windows/SettingsWINDOWS.o \
src/os/windows/stella_icon.o
MODULE_TEST_OBJS =
MODULE_DIRS += \
src/os/windows