6502/6502-cpp
1
0
Fork 0
mirror of https://github.com/lefticus/6502-cpp.git synced 2024-12-21 10:30:35 +00:00
Code Issues Projects Releases Wiki Activity

Fix use of address 1 to literal 1 for skip instructions

Browse Source 
Thank you to the viewers who pointed out the issue at the
end of the stream.

At this point, simple code works, but the conditional
from the joystick input does not seem to work yet.

 * also add location header for linker
 * also filter errors and directives better
This commit is contained in:
Jason Turner 2021-04-22 18:52:50 -06:00
parent 5591249f2a
commit 24012c1ff7
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/test.cpp
View File

@ -5,22 +5,22 @@ enum Colors : uint8_t
WHITE=0x01
};
volatile uint8_t &memory_loc(const uint16_t loc)
static volatile uint8_t &memory_loc(const uint16_t loc)
{
return *reinterpret_cast<volatile uint8_t *>(loc);
}
void decrement_border_color()
static void decrement_border_color()
{
--memory_loc(0xd020);
}
void increment_border_color()
static void increment_border_color()
{
++memory_loc(0xd020);
}
bool joystick_down()
static bool joystick_down()
{
uint8_t joystick_state = memory_loc(0xDC00);
return (joystick_state & 0x2) == 0;
@ -36,7 +36,7 @@ int main()
while(true) {
if (joystick_down()) {
increment_border_color();
// increment_border_color();
} else {
decrement_border_color();
}

19
src/main.cpp
View File

@ -700,7 +700,7 @@ void translate_instruction(std::vector<mos6502> &instructions, const AVR::OpCode
return;
}
case AVR::OpCode::sbrc: {
instructions.emplace_back(mos6502::OpCode::lda, Operand(o2.type, fixup_8bit_literal(std::to_string(1 << (atoi(o2.value.c_str())-1)))));
instructions.emplace_back(mos6502::OpCode::lda, Operand(o2.type, fixup_8bit_literal("$" + std::to_string(1 << (atoi(o2.value.c_str())-1)))));
instructions.emplace_back(mos6502::OpCode::bit, AVR::get_register(o1.reg_num));
std::string new_label_name = "skip_next_instruction_" + std::to_string(instructions.size());
instructions.emplace_back(mos6502::OpCode::beq, Operand(Operand::Type::literal, new_label_name));
@ -708,7 +708,7 @@ void translate_instruction(std::vector<mos6502> &instructions, const AVR::OpCode
return;
}
case AVR::OpCode::sbrs: {
instructions.emplace_back(mos6502::OpCode::lda, Operand(o2.type, fixup_8bit_literal(std::to_string(1 << (atoi(o2.value.c_str())-1)))));
instructions.emplace_back(mos6502::OpCode::lda, Operand(o2.type, fixup_8bit_literal("$" + std::to_string(1 << (atoi(o2.value.c_str())-1)))));
instructions.emplace_back(mos6502::OpCode::bit, AVR::get_register(o1.reg_num));
std::string new_label_name = "skip_next_instruction_" + std::to_string(instructions.size());
instructions.emplace_back(mos6502::OpCode::bne, Operand(Operand::Type::literal, new_label_name));
@ -1028,12 +1028,12 @@ std::string to_string(const LogLevel ll)
template<typename FromArch>
void log(LogLevel ll, const FromArch &i, const std::string &message)
{
std::cout << to_string(ll) << ": " << i.line_num << ": " << message << ": `" << i.line_text << "`\n";
std::cerr << to_string(ll) << ": " << i.line_num << ": " << message << ": `" << i.line_text << "`\n";
}
void log(LogLevel ll, const int line_no, const std::string &line, const std::string &message)
{
std::cout << to_string(ll) << ": " << line_no << ": " << message << ": `" << line << "`\n";
std::cerr << to_string(ll) << ": " << line_no << ": " << message << ": `" << line << "`\n";
}
template<typename FromArch>
@ -1217,10 +1217,9 @@ bool fix_overwritten_flags(std::vector<mos6502> &instructions)
template<typename Arch>
void run(std::istream &input) {
std::cout << "; run\n";
std::regex Comment(R"(\s*\#.*)");
std::regex Label(R"(^(\S+):.*)");
std::regex Directive(R"(^\s+(\..+))");
std::regex Directive(R"(^\s*(\..+))");
std::regex UnaryInstruction(R"(^\s+(\S+)\s+(\S+))");
std::regex BinaryInstruction(R"(^\s+(\S+)\s+(\S+),\s*(\S+))");
std::regex Instruction(R"(^\s+(\S+))");
@ -1251,9 +1250,6 @@ void run(std::istream &input) {
} else if (std::regex_match(line, match, Instruction)) {
instructions.emplace_back(lineno, line, ASMLine::Type::Instruction, match[1]);
} else if (line == "") {
//std::cout << "EmptyLine\n";
} else {
throw std::runtime_error("Unparsed Input, Line: " + std::to_string(lineno));
}
} catch (const std::exception &e) {
log(LogLevel::Error, lineno, line, e.what());
@ -1295,6 +1291,9 @@ void run(std::istream &input) {
return true;
}
}
if (i.type == ASMLine::Type::Directive) {
return true;
}
return false;
}
),
@ -1337,6 +1336,8 @@ void run(std::istream &input) {
std::vector<mos6502> new_instructions;
new_instructions.emplace_back(ASMLine::Type::Directive, ".word $1000");
new_instructions.emplace_back(ASMLine::Type::Directive, "* = $1000");
bool skip_next_instruction = false;
std::string next_label_name;