diff options
| -rw-r--r-- | core/bits.c (renamed from tasm/src/bits.c) | 2 | ||||
| -rw-r--r-- | core/bits.h (renamed from tasm/include/tasm/bits.h) | 4 | ||||
| -rw-r--r-- | core/regs.h (renamed from tasm/include/tasm/regs.h) | 0 | ||||
| -rw-r--r-- | tasm/Makefile | 2 | ||||
| -rw-r--r-- | tasm/gen/gen_parser.c | 4 | ||||
| -rw-r--r-- | tasm/include/tasm/assembler.h | 2 | ||||
| -rw-r--r-- | tasm/src/assembler.c | 2 | ||||
| -rw-r--r-- | tasm/src/parser.y | 4 | ||||
| -rw-r--r-- | triscv/Makefile | 2 | ||||
| -rw-r--r-- | triscv/scripts/makefile | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/tasm/src/bits.c b/core/bits.c index 7a54632..cfe0f20 100644 --- a/tasm/src/bits.c +++ b/core/bits.c @@ -1,4 +1,4 @@ -#include <tasm/bits.h> +#include <bits.h> tri_t parse_opcode(tri_t i) { diff --git a/tasm/include/tasm/bits.h b/core/bits.h index 2070425..93226bb 100644 --- a/tasm/include/tasm/bits.h +++ b/core/bits.h @@ -1,8 +1,8 @@ #ifndef TASM_BITS_H #define TASM_BITS_H -#include <tasm/regs.h> -#include <tri.h> +#include "regs.h" +#include "tri.h" #define OPCODE_OP_IMM 0b0000000000 #define OP_IMM_ADDI 0b0000000000 diff --git a/tasm/include/tasm/regs.h b/core/regs.h index 3018ea4..3018ea4 100644 --- a/tasm/include/tasm/regs.h +++ b/core/regs.h diff --git a/tasm/Makefile b/tasm/Makefile index e5c54c1..b9abd49 100644 --- a/tasm/Makefile +++ b/tasm/Makefile @@ -22,7 +22,7 @@ setup: CLEANUP := build deps.mk tasm CLEANUP_CMD := -TASM_SOURCES := +TASM_SOURCES := ../core/bits.c include src/source.mk diff --git a/tasm/gen/gen_parser.c b/tasm/gen/gen_parser.c index 9e2a4cf..aadb8fb 100644 --- a/tasm/gen/gen_parser.c +++ b/tasm/gen/gen_parser.c @@ -80,8 +80,8 @@ #include <tasm/assembler.h> #include <tasm/parser.h> -#include <tasm/bits.h> -#include <tasm/regs.h> +#include <bits.h> +#include <regs.h> #include <tri.h> diff --git a/tasm/include/tasm/assembler.h b/tasm/include/tasm/assembler.h index 52ab867..6941186 100644 --- a/tasm/include/tasm/assembler.h +++ b/tasm/include/tasm/assembler.h @@ -1,7 +1,7 @@ #ifndef TASM_ASSEMBLER_H #define TASM_ASSEMBLER_H -#include <tasm/regs.h> +#include <regs.h> #include <tri.h> struct asm_ctx; diff --git a/tasm/src/assembler.c b/tasm/src/assembler.c index 9f6dc95..3faf1fb 100644 --- a/tasm/src/assembler.c +++ b/tasm/src/assembler.c @@ -1,6 +1,6 @@ #include <tasm/assembler.h> #include <tasm/parser.h> -#include <tasm/bits.h> +#include <bits.h> #include <string.h> #include <unistd.h> diff --git a/tasm/src/parser.y b/tasm/src/parser.y index 559cbba..64418d1 100644 --- a/tasm/src/parser.y +++ b/tasm/src/parser.y @@ -13,8 +13,8 @@ #include <tasm/assembler.h> #include <tasm/parser.h> -#include <tasm/bits.h> -#include <tasm/regs.h> +#include <bits.h> +#include <regs.h> #include <tri.h> %} diff --git a/triscv/Makefile b/triscv/Makefile index adceb03..88ba7aa 100644 --- a/triscv/Makefile +++ b/triscv/Makefile @@ -22,7 +22,7 @@ setup: CLEANUP := build deps.mk triscv CLEANUP_CMD := -TRISCV_SOURCES := deps/utf9/utf9.c +TRISCV_SOURCES := ../utf9/utf9.c ../core/bits.c include src/source.mk diff --git a/triscv/scripts/makefile b/triscv/scripts/makefile index 50510f8..ff8b185 100644 --- a/triscv/scripts/makefile +++ b/triscv/scripts/makefile @@ -41,7 +41,7 @@ WARNFLAGS = -Wall -Wextra COMPILE_FLAGS = $(CFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(OBFLAGS) $(ASSERTFLAGS) \ $(DEBUGFLAGS) -INCLUDE_FLAGS = -I include -I ../core -I deps/utf9 +INCLUDE_FLAGS = -I include -I ../core -I ../utf9 # This makes sure .bss is loaded into the binary OBJCOPY_FLAGS ?= -Obinary -R .garbage \ |