6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2025-01-07 20:31:16 +00:00
Code Issues Projects Releases Wiki Activity

Correct Linux build errors.

Browse Source 
Signed-off-by: Adrian Conlon <adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon 2018-12-01 16:41:39 +00:00
parent cf0828c595
commit 679275e930
11 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Intel8080/test/Makefile
View File

@ -2,7 +2,7 @@ EXE = test_intel8080
CXXFLAGS = -I ../inc -I ../../inc CXXFLAGS = -I ../inc -I ../../inc
CXXFILES = Board.cpp Configuration.cpp test.cpp CXXFILES = Board.cpp test.cpp
LDFLAGS = -L ../src -L ../../src -lintel8080 -leightbit LDFLAGS = -L ../src -L ../../src -lintel8080 -leightbit

6
M6502/src/Profiler.cpp
View File

@ -33,7 +33,8 @@ void EightBit::Profiler::EmitProfileInformation() {
if (cycles > 0) { if (cycles > 0) {
// Dump a profile/disassembly line // Dump a profile/disassembly line
auto source = disassembler.disassemble(address); auto source = disassembler.disassemble(address);
EmitLine.fire(ProfileLineEventArgs(source, cycles)); ProfileLineEventArgs event(source, cycles);
EmitLine.fire(event);
} }
} }
FinishedLineOutput.fire(EventArgs::empty()); FinishedLineOutput.fire(EventArgs::empty());
@ -46,7 +47,8 @@ void EightBit::Profiler::EmitProfileInformation() {
auto cycles = scopeCycle.second; auto cycles = scopeCycle.second;
auto namedAddress = (size_t)symbols.addresses().find(name)->second; auto namedAddress = (size_t)symbols.addresses().find(name)->second;
auto count = addressCounts[namedAddress]; auto count = addressCounts[namedAddress];
EmitScope.fire(ProfileScopeEventArgs(name, cycles, count)); ProfileScopeEventArgs event(name, cycles, count);
EmitScope.fire(event);
} }
FinishedScopeOutput.fire(EventArgs::empty()); FinishedScopeOutput.fire(EventArgs::empty());
} }

4
M6502/test/Board.h
View File

@ -4,12 +4,12 @@
#include <string> #include <string>
#include <Ram.h>
#include <Bus.h> #include <Bus.h>
#include <Disassembly.h> #include <Disassembly.h>
#include <mos6502.h> #include <mos6502.h>
#include <Symbols.h> #include <Ram.h>
#include <Register.h> #include <Register.h>
#include <Symbols.h>
class Board : public EightBit::Bus { class Board : public EightBit::Bus {
public: public:

2
M6502/test/Makefile
View File

@ -2,7 +2,7 @@ EXE = test_m6502
CXXFLAGS = -I ../inc -I ../../inc 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 LDFLAGS = -L ../src -L ../../src -lboost_regex -lm6502 -leightbit

14
M6502/test/stdafx.h
View File

@ -2,24 +2,20 @@
#pragma once #pragma once
#endif #endif
#include <cassert>
#include <cstdint> #include <cstdint>
#include <string>
#include <sstream>
#include <iomanip> #include <iomanip>
#include <iostream> #include <iostream>
#include <string>
#include <assert.h> #include <sstream>
#ifdef _MSC_VER #ifdef _MSC_VER
#include <conio.h> #include <conio.h>
#endif #endif
#include <Ram.h>
#include <Bus.h> #include <Bus.h>
#include <Profiler.h>
#include <Disassembly.h> #include <Disassembly.h>
#include <mos6502.h> #include <Profiler.h>
#include <Ram.h>
#include <Symbols.h> #include <Symbols.h>
#include <TestHarness.h> #include <TestHarness.h>

2
Z80/test/Configuration.h
View File

@ -6,7 +6,7 @@
class Configuration final { class Configuration final {
public: public:
Configuration() noexcept = default; Configuration() = default;
bool isDebugMode() const { bool isDebugMode() const {
return m_debugMode; return m_debugMode;

2
Z80/test/Makefile
View File

@ -2,7 +2,7 @@ EXE = test_z80
CXXFLAGS = -I ../inc -I ../../inc CXXFLAGS = -I ../inc -I ../../inc
CXXFILES = Board.cpp Configuration.cpp test.cpp CXXFILES = Board.cpp test.cpp
LDFLAGS = -L ../src -L ../../src -lz80 -leightbit LDFLAGS = -L ../src -L ../../src -lz80 -leightbit

2
compile.mk
View File

@ -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_OPT = -DNDEBUG -march=native -Ofast -flto
CXXFLAGS_DEBUG = -D_DEBUG CXXFLAGS_DEBUG = -D_DEBUG

2
inc/EightBitCompilerDefinitions.h
View File

@ -15,7 +15,7 @@ namespace EightBit {
constexpr void assume(int expression); 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 #ifdef _MSC_VER
return __popcnt(value); return __popcnt(value);
#else #else

4
inc/TestHarness.h
View File

@ -82,11 +82,11 @@ namespace EightBit {
uint64_t m_startHostCycles = 0; uint64_t m_startHostCycles = 0;
uint64_t m_finishHostCycles = 0; uint64_t m_finishHostCycles = 0;
static [[nodiscard]] auto now() { [[nodiscard]] static auto now() {
return std::chrono::steady_clock::now(); return std::chrono::steady_clock::now();
} }
static [[nodiscard]] uint64_t currentHostCycles() { [[nodiscard]] static uint64_t currentHostCycles() {
return __rdtsc(); return __rdtsc();
} }
}; };

2
src/Makefile
View File

@ -2,7 +2,7 @@ LIB = libeightbit.a
CXXFLAGS = -I ../inc 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 ../compile.mk
include ../lib_build.mk include ../lib_build.mk