mirror of
https://github.com/MoleskiCoder/EightBit.git
synced 2024-11-01 23:04:29 +00:00
Correct Linux build errors.
Signed-off-by: Adrian Conlon <adrian.conlon@gmail.com>
This commit is contained in:
parent
cf0828c595
commit
679275e930
@ -2,7 +2,7 @@ EXE = test_intel8080
|
||||
|
||||
CXXFLAGS = -I ../inc -I ../../inc
|
||||
|
||||
CXXFILES = Board.cpp Configuration.cpp test.cpp
|
||||
CXXFILES = Board.cpp test.cpp
|
||||
|
||||
LDFLAGS = -L ../src -L ../../src -lintel8080 -leightbit
|
||||
|
||||
|
@ -33,7 +33,8 @@ void EightBit::Profiler::EmitProfileInformation() {
|
||||
if (cycles > 0) {
|
||||
// Dump a profile/disassembly line
|
||||
auto source = disassembler.disassemble(address);
|
||||
EmitLine.fire(ProfileLineEventArgs(source, cycles));
|
||||
ProfileLineEventArgs event(source, cycles);
|
||||
EmitLine.fire(event);
|
||||
}
|
||||
}
|
||||
FinishedLineOutput.fire(EventArgs::empty());
|
||||
@ -46,7 +47,8 @@ void EightBit::Profiler::EmitProfileInformation() {
|
||||
auto cycles = scopeCycle.second;
|
||||
auto namedAddress = (size_t)symbols.addresses().find(name)->second;
|
||||
auto count = addressCounts[namedAddress];
|
||||
EmitScope.fire(ProfileScopeEventArgs(name, cycles, count));
|
||||
ProfileScopeEventArgs event(name, cycles, count);
|
||||
EmitScope.fire(event);
|
||||
}
|
||||
FinishedScopeOutput.fire(EventArgs::empty());
|
||||
}
|
||||
@ -80,4 +82,4 @@ void EightBit::Profiler::BuildAddressScopes() {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -4,12 +4,12 @@
|
||||
|
||||
#include <string>
|
||||
|
||||
#include <Ram.h>
|
||||
#include <Bus.h>
|
||||
#include <Disassembly.h>
|
||||
#include <mos6502.h>
|
||||
#include <Symbols.h>
|
||||
#include <Ram.h>
|
||||
#include <Register.h>
|
||||
#include <Symbols.h>
|
||||
|
||||
class Board : public EightBit::Bus {
|
||||
public:
|
||||
|
@ -2,7 +2,7 @@ EXE = test_m6502
|
||||
|
||||
CXXFLAGS = -I ../inc -I ../../inc
|
||||
|
||||
CXXFILES = Board.cpp Configuration.cpp test.cpp
|
||||
CXXFILES = Board.cpp test.cpp
|
||||
|
||||
LDFLAGS = -L ../src -L ../../src -lboost_regex -lm6502 -leightbit
|
||||
|
||||
|
@ -2,24 +2,20 @@
|
||||
#pragma once
|
||||
#endif
|
||||
|
||||
#include <cassert>
|
||||
#include <cstdint>
|
||||
|
||||
#include <string>
|
||||
|
||||
#include <sstream>
|
||||
#include <iomanip>
|
||||
#include <iostream>
|
||||
|
||||
#include <assert.h>
|
||||
#include <string>
|
||||
#include <sstream>
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#include <conio.h>
|
||||
#endif
|
||||
|
||||
#include <Ram.h>
|
||||
#include <Bus.h>
|
||||
#include <Profiler.h>
|
||||
#include <Disassembly.h>
|
||||
#include <mos6502.h>
|
||||
#include <Profiler.h>
|
||||
#include <Ram.h>
|
||||
#include <Symbols.h>
|
||||
#include <TestHarness.h>
|
||||
|
@ -6,7 +6,7 @@
|
||||
|
||||
class Configuration final {
|
||||
public:
|
||||
Configuration() noexcept = default;
|
||||
Configuration() = default;
|
||||
|
||||
bool isDebugMode() const {
|
||||
return m_debugMode;
|
||||
|
@ -2,7 +2,7 @@ EXE = test_z80
|
||||
|
||||
CXXFLAGS = -I ../inc -I ../../inc
|
||||
|
||||
CXXFILES = Board.cpp Configuration.cpp test.cpp
|
||||
CXXFILES = Board.cpp test.cpp
|
||||
|
||||
LDFLAGS = -L ../src -L ../../src -lz80 -leightbit
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
CXXFLAGS += -g -Wall -std=c++14 -pipe
|
||||
CXXFLAGS += -g -Wall -std=c++17 -pipe
|
||||
|
||||
CXXFLAGS_OPT = -DNDEBUG -march=native -Ofast -flto
|
||||
CXXFLAGS_DEBUG = -D_DEBUG
|
||||
|
@ -15,7 +15,7 @@ namespace EightBit {
|
||||
constexpr void assume(int expression);
|
||||
}
|
||||
|
||||
inline int EightBit::countBits(const uint8_t value) noexcept {
|
||||
inline int EightBit::countBits(uint8_t value) noexcept {
|
||||
#ifdef _MSC_VER
|
||||
return __popcnt(value);
|
||||
#else
|
||||
|
@ -82,11 +82,11 @@ namespace EightBit {
|
||||
uint64_t m_startHostCycles = 0;
|
||||
uint64_t m_finishHostCycles = 0;
|
||||
|
||||
static [[nodiscard]] auto now() {
|
||||
[[nodiscard]] static auto now() {
|
||||
return std::chrono::steady_clock::now();
|
||||
}
|
||||
|
||||
static [[nodiscard]] uint64_t currentHostCycles() {
|
||||
[[nodiscard]] static uint64_t currentHostCycles() {
|
||||
return __rdtsc();
|
||||
}
|
||||
};
|
||||
|
@ -2,7 +2,7 @@ LIB = libeightbit.a
|
||||
|
||||
CXXFLAGS = -I ../inc
|
||||
|
||||
CXXFILES = Bus.cpp EventArgs.cpp InputOutput.cpp IntelProcessor.cpp Memory.cpp Processor.cpp
|
||||
CXXFILES = BigEndianProcessor.cpp Bus.cpp Chip.cpp EventArgs.cpp InputOutput.cpp IntelProcessor.cpp LittleEndianProcessor.cpp Memory.cpp Processor.cpp Ram.cpp Rom.cpp UnusedMemory.cpp
|
||||
|
||||
include ../compile.mk
|
||||
include ../lib_build.mk
|
||||
|
Loading…
Reference in New Issue
Block a user