andre/tyche
1
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

Assembler #6

Merged
andre merged 12 commits from assembler into master 2026-05-01 10:12:41 -05:00
Conversation 0 Commits 12 Files Changed 13 +90 -25
5 changed files with 90 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1269a158f5 - Show all commits

39
src/assembler/assembler.cc
View File

@@ -3,12 +3,15 @@
#include "as_exceptions.hh"
#include "../bytecode/bytecode.hh"
using namespace std::string_literals;
namespace tyche::as {
ByteArray Assembler::assemble()
{
bc::BytecodePrototype bp;
lexer_.reset();
bp_ = {};
enum class Section { Const, Function } section;
uint32_t function_id = 0;
@@ -17,16 +20,46 @@ ByteArray Assembler::assemble()
Token t = lexer_.ingest();
if (t.type == TokenType::Directive) {
if (std::get<std::string>(t.token) == ".const") {
section = Section::Const;
expect_token(TokenType::Enter);
} else if (std::get<std::string>(t.token) == ".func") {
section = Section::Function;
function_id = std::get<int>(expect_token(TokenType::Integer));
expect_token(TokenType::Enter);
} else {
throw AssemblyError("Invalid directive " + std::get<std::string>(t.token), t.line, t.column);
}
} else if (section == Section::Const && t.type == TokenType::Integer) {
int index = std::get<int>(expect_token(TokenType::Integer));
if ((size_t) index >= bp.constants.size())
bp.constants.resize(index + 1);
expect_token(TokenType::Colon);
Token tt = lexer_.ingest();
if (tt.type == TokenType::Float) {
bp.constants[index] = std::get<float>(tt.token);
} else if (tt.type == TokenType::String) {
bp.constants[index] = std::get<std::string>(tt.token);
} else {
throw AssemblyError("Expected float or string as constant", tt.line, tt.column);
}
} else if (section == Section::Function && t.type == TokenType::Instruction) {
} else if (t.type == TokenType::EOF_) {
break;
} else if (t.type != TokenType::Enter) {
throw AssemblyError("Unexpected token " + t.token, t.line, t.column);
throw AssemblyError("Unexpected token of type " + token_type_name(t.type) + ")", t.line, t.column);
}
}
return bc::Bytecode::generate(bp_);
return bc::Bytecode::generate(bp);
}
TokenValue Assembler::expect_token(TokenType type)
{
Token t = lexer_.ingest();
if (t.type != type)
throw AssemblyError("Expected " + token_type_name(t.type), t.line, t.column);
return t.token;
}
} // tyche

3
src/assembler/assembler.hh
View File

@@ -17,7 +17,8 @@ public:
private:
Lexer lexer_;
bc::BytecodePrototype bp_;
TokenValue expect_token(TokenType type);
};
} // tyche

45
src/assembler/lexer.cc
View File

@@ -4,6 +4,22 @@
namespace tyche::as {
std::string token_type_name(TokenType type)
{
switch (type) {
case TokenType::BOF: return "BOF";
case TokenType::Directive: return "directive";
case TokenType::Instruction: return "instruction";
case TokenType::Integer: return "integer";
case TokenType::Float: return "float";
case TokenType::String: return "string";
case TokenType::Enter: return "enter";
case TokenType::Colon: return "colon";
case TokenType::EOF_: return "EOF";
default: return "???";
}
}
void Lexer::reset()
{
pos_ = 0;
@@ -28,20 +44,22 @@ void Lexer::ingest_next_token()
size_t current_line = 1;
if (pos_ >= source_.size()) {
current_token_ = { TokenType::EOF_, "" };
current_token_ = { TokenType::EOF_ };
return;
}
char c = source_.at(pos_);
TokenType type {};
std::string token;
std::string stoken;
TokenValue value = std::monostate();
if (c == '.') {
type = TokenType::Directive;
token += '.';
stoken += '.';
while (c = source_.at(++pos_), isalpha(c) || c == '_')
token += c;
stoken += c;
value = stoken;
} else if (c == '"') {
type = TokenType::String;
++pos_;
@@ -54,13 +72,14 @@ void Lexer::ingest_next_token()
} else if (pos_ >= source_.size()) {
throw AssemblyError("Unterminated string", current_line, pos_ - current_line_pos);
}
token += source_.at(pos_++);
stoken += source_.at(pos_++);
}
value = stoken;
} else if (isdigit(c) || c == '-') {
type = TokenType::Integer;
token += c;
stoken += c;
while (c = source_.at(++pos_), isdigit(c) || c == '.') {
token += c;
stoken += c;
if (c == '.') {
if (type == TokenType::Integer)
type = TokenType::Float;
@@ -68,16 +87,22 @@ void Lexer::ingest_next_token()
throw AssemblyError("Double point in floating point number", current_line, pos_ - current_line_pos);
}
}
if (type == TokenType::Integer)
value = std::stoi(stoken);
else
value = std::stof(stoken);
} else if (isalpha(c)) {
type = TokenType::Instruction;
token += c;
stoken += c;
while (c = source_.at(++pos_), isalpha(c))
token += c;
stoken += c;
value = stoken;
} else if (c == ':') {
type = TokenType::Colon;
++pos_;
} else if (c == '\n') {
type = TokenType::Enter;
value = "\n";
++pos_;
++current_line;
current_line_pos = pos_;
@@ -89,7 +114,7 @@ void Lexer::ingest_next_token()
while (pos_ < source_.size() && (source_.at(pos_) == ' ' || source_.at(pos_) == '\t' || source_.at(pos_) == '\r'))
++pos_;
current_token_ = { .type = type, .token = token, .line = current_line, .column = pos_ - current_line_pos };
current_token_ = { .type = type, .token = value, .line = current_line, .column = pos_ - current_line_pos };
}
} // tyche

13
src/assembler/lexer.hh
View File

@@ -3,6 +3,7 @@
#include <string>
#include <utility>
#include <variant>
namespace tyche::as {
@@ -10,15 +11,19 @@ enum class TokenType {
BOF, Directive, Instruction, Integer, Float, String, Enter, Colon, EOF_
};
using TokenValue = std::variant<std::monostate, int, float, std::string>;
struct Token {
TokenType type;
std::string token;
size_t line;
size_t column;
TokenValue token = std::monostate();
size_t line = 0;
size_t column = 0;
friend bool operator==(Token const& lhs, Token const& rhs) { return std::tie(lhs.type, lhs.token) == std::tie(rhs.type, rhs.token); }
};
std::string token_type_name(TokenType type);
class Lexer {
public:
explicit Lexer(std::string source) : source_(std::move(source)) { reset(); }
@@ -30,7 +35,7 @@ public:
private:
const std::string source_;
size_t pos_ = 0;
Token current_token_ { TokenType::BOF, "" };
Token current_token_ { TokenType::BOF };
void ingest_next_token();
};

15
src/assembler/tests.cc
View File

@@ -12,17 +12,18 @@ using namespace tyche::vm;
TEST(Lexer, Lexer)
{
Token t;
Lexer lexer(".dir push 382 -12 3.14 -12.8 \"Hello\" \"Hel\\\"lo\"\n");
ASSERT_EQ(lexer.ingest(), (Token { TokenType::Directive, ".dir" }));
ASSERT_EQ(lexer.ingest(), (Token { TokenType::Instruction, "push" }));
ASSERT_EQ(lexer.ingest(), (Token { TokenType::Integer, "382" }));
ASSERT_EQ(lexer.ingest(), (Token { TokenType::Integer, "-12" }));
ASSERT_EQ(lexer.ingest(), (Token { TokenType::Float, "3.14" }));
ASSERT_EQ(lexer.ingest(), (Token { TokenType::Float, "-12.8" }));
t = lexer.ingest(); ASSERT_EQ(t.type, TokenType::Integer); ASSERT_EQ(std::get<int>(t.token), 382);
t = lexer.ingest(); ASSERT_EQ(t.type, TokenType::Integer); ASSERT_EQ(std::get<int>(t.token), -12);
t = lexer.ingest(); ASSERT_EQ(t.type, TokenType::Float); ASSERT_FLOAT_EQ(std::get<float>(t.token), 3.14f);
t = lexer.ingest(); ASSERT_EQ(t.type, TokenType::Float); ASSERT_FLOAT_EQ(std::get<float>(t.token), -12.8f);
ASSERT_EQ(lexer.ingest(), (Token { TokenType::String, "Hello" }));
ASSERT_EQ(lexer.ingest(), (Token { TokenType::String, "Hel\"lo" }));
ASSERT_EQ(lexer.ingest(), (Token { TokenType::Enter }));
ASSERT_EQ(lexer.ingest(), (Token { TokenType::Enter, "\n" }));
ASSERT_EQ(lexer.ingest(), (Token { TokenType::EOF_ }));
ASSERT_EQ(lexer.ingest(), (Token { TokenType::EOF_ }));
ASSERT_EQ(lexer.ingest(), (Token { TokenType::EOF_ }));
@@ -54,12 +55,12 @@ TEST(Assember, Assembler)
0: 3.14
1: "Hello world"
.function 0
.func 0
pushi 2
pushi 3
sum
ret
.function 1
.func 1
pushi 5000
ret
)";