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

Refactor the processor class to give us a "Chip" class that gives up pin levels and power.

Browse Source 
Signed-off-by: Adrian Conlon <Adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon 2018-09-23 13:10:58 +01:00
parent 91349eafa4
commit 754fc8e6a3
6 changed files with 95 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
inc/Chip.h Normal file
View File

@ -0,0 +1,78 @@
#pragma once
#include <cstdint>
namespace EightBit {
class Chip {
public:
enum Bits {
Bit0 = 1,
Bit1 = Bit0 << 1,
Bit2 = Bit1 << 1,
Bit3 = Bit2 << 1,
Bit4 = Bit3 << 1,
Bit5 = Bit4 << 1,
Bit6 = Bit5 << 1,
Bit7 = Bit6 << 1,
Bit8 = Bit7 << 1,
Bit9 = Bit8 << 1,
Bit10 = Bit9 << 1,
Bit11 = Bit10 << 1,
Bit12 = Bit11 << 1,
Bit13 = Bit12 << 1,
Bit14 = Bit13 << 1,
Bit15 = Bit14 << 1,
Bit16 = Bit15 << 1
};
enum Masks {
Mask1 = Bit1 - 1,
Mask2 = Bit2 - 1,
Mask3 = Bit3 - 1,
Mask4 = Bit4 - 1,
Mask5 = Bit5 - 1,
Mask6 = Bit6 - 1,
Mask7 = Bit7 - 1,
Mask8 = Bit8 - 1,
Mask9 = Bit9 - 1,
Mask10 = Bit10 - 1,
Mask11 = Bit11 - 1,
Mask12 = Bit12 - 1,
Mask13 = Bit13 - 1,
Mask14 = Bit14 - 1,
Mask15 = Bit15 - 1,
Mask16 = Bit16 - 1
};
enum PinLevel {
Low, High
};
static bool raised(const PinLevel line) { return line == High; }
static void raise(PinLevel& line) { line = High; }
static bool lowered(const PinLevel line) { return line == Low; }
static void lower(PinLevel& line) { line = Low; }
static int highNibble(const int value) { return value >> 4; }
static int lowNibble(const int value) { return value & Mask4; }
static int higherNibble(const int value) { return value & 0xf0; }
static int lowerNibble(const int value) { return lowNibble(value); }
static int promoteNibble(const int value) { return value << 4; }
static int demoteNibble(const int value) { return highNibble(value); }
PinLevel& POWER() { return m_powerLine; }
bool powered() { return raised(POWER()); }
virtual void powerOn();
void powerOff() { lower(POWER()); }
protected:
Chip() = default;
virtual ~Chip() = default;
private:
PinLevel m_powerLine = Low;
};
}

64
inc/Processor.h
View File

@ -2,71 +2,15 @@
#include <cstdint>
#include "Chip.h"
#include "Bus.h"
#include "Register.h"
#include "EightBitCompilerDefinitions.h"
namespace EightBit {
class Processor {
class Processor : public Chip {
public:
enum Bits {
Bit0 = 1,
Bit1 = Bit0 << 1,
Bit2 = Bit1 << 1,
Bit3 = Bit2 << 1,
Bit4 = Bit3 << 1,
Bit5 = Bit4 << 1,
Bit6 = Bit5 << 1,
Bit7 = Bit6 << 1,
Bit8 = Bit7 << 1,
Bit9 = Bit8 << 1,
Bit10 = Bit9 << 1,
Bit11 = Bit10 << 1,
Bit12 = Bit11 << 1,
Bit13 = Bit12 << 1,
Bit14 = Bit13 << 1,
Bit15 = Bit14 << 1,
Bit16 = Bit15 << 1
};
enum Masks {
Mask1 = Bit1 - 1,
Mask2 = Bit2 - 1,
Mask3 = Bit3 - 1,
Mask4 = Bit4 - 1,
Mask5 = Bit5 - 1,
Mask6 = Bit6 - 1,
Mask7 = Bit7 - 1,
Mask8 = Bit8 - 1,
Mask9 = Bit9 - 1,
Mask10 = Bit10 - 1,
Mask11 = Bit11 - 1,
Mask12 = Bit12 - 1,
Mask13 = Bit13 - 1,
Mask14 = Bit14 - 1,
Mask15 = Bit15 - 1,
Mask16 = Bit16 - 1
};
enum PinLevel {
Low, High
};
static bool raised(const PinLevel line) { return line == High; }
static void raise(PinLevel& line) { line = High; }
static bool lowered(const PinLevel line) { return line == Low; }
static void lower(PinLevel& line) { line = Low; }
static int highNibble(const int value) { return value >> 4; }
static int lowNibble(const int value) { return value & Mask4; }
static int higherNibble(const int value) { return value & 0xf0; }
static int lowerNibble(const int value) { return lowNibble(value); }
static int promoteNibble(const int value) { return value << 4; }
static int demoteNibble(const int value) { return highNibble(value); }
// b: number of bits representing the number in x
// x: sign extend this b-bit number to r
static int8_t signExtend(int b, uint8_t x);
@ -79,11 +23,8 @@ namespace EightBit {
PinLevel& HALT() { return m_haltLine; }
PinLevel& INT() { return m_intLine; }
PinLevel& IRQ() { return INT(); } // Synonym
PinLevel& POWER() { return m_powerLine; }
bool powered() { return raised(POWER()); }
virtual void powerOn();
void powerOff() { lower(POWER()); }
void reset() { lower(RESET()); }
int run(int limit);
@ -178,6 +119,5 @@ namespace EightBit {
PinLevel m_intLine = Low;
PinLevel m_haltLine = Low;
PinLevel m_resetLine = Low;
PinLevel m_powerLine = Low;
};
}

6
src/Chip.cpp Normal file
View File

@ -0,0 +1,6 @@
#include "stdafx.h"
#include "Chip.h"
void EightBit::Chip::powerOn() {
raise(POWER());
}

2
src/EightBit.vcxproj
View File

@ -138,6 +138,7 @@
<ItemGroup>
<ClInclude Include="..\inc\BigEndianProcessor.h" />
<ClInclude Include="..\inc\Bus.h" />
<ClInclude Include="..\inc\Chip.h" />
<ClInclude Include="..\inc\EightBitCompilerDefinitions.h" />
<ClInclude Include="..\inc\EventArgs.h" />
<ClInclude Include="..\inc\InputOutput.h" />
@ -155,6 +156,7 @@
<ItemGroup>
<ClCompile Include="BigEndianProcessor.cpp" />
<ClCompile Include="Bus.cpp" />
<ClCompile Include="Chip.cpp" />
<ClCompile Include="EventArgs.cpp" />
<ClCompile Include="InputOutput.cpp" />
<ClCompile Include="IntelProcessor.cpp" />

6
src/EightBit.vcxproj.filters
View File

@ -56,6 +56,9 @@
<ClInclude Include="..\inc\MemoryMapping.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\inc\Chip.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="stdafx.cpp">
@ -85,5 +88,8 @@
<ClCompile Include="BigEndianProcessor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Chip.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>

2
src/Processor.cpp
View File

@ -6,10 +6,10 @@ EightBit::Processor::Processor(Bus& bus)
}
void EightBit::Processor::powerOn() {
Chip::powerOn();
raise(RESET());
raise(HALT());
raise(INT());
raise(POWER());
}
void EightBit::Processor::handleRESET() {