mostly fixes

- riscv: added IR_COPY to IR_FCALL(memcpy) conversion
- riscv: disabled unfinished code
- riscv: fixed wrong include paths
- fixed test2
- fixed fix_crts.sh for cross-compilation
- fixed configure-target-libbcc
- updated TODO
- removed false comment in ir.h

Makefile.am

@@ -93,7 +93,7 @@ full-clean: clean full-clean-target-libbcc
 
 if ENABLE_LIBBCC
 configure-target-libbcc: bcc
-	cd $(srcdir)/libbcc && CC=../bcc ./configure --host=$(TARGET)
+	cd $(srcdir)/libbcc && CC="../bcc -e ../cpp/bcpp" ./configure --host=$(TARGET)
 all-target-libbcc: configure-target-libbcc
 	$(MAKE) -C libbcc
 install-target-libbcc:

TODO

@@ -52,13 +52,14 @@ riscv:
 - simplify
 - fix bugs
 - remove _GNU_SOURCE dependency
+- make test2 be usable without installation of libbcc
 
 
 # Other
 - find & fix reason for random crashes
 - options: -g, --sysroot=, -static, -shared, -save-temps
 - <stdarg.h> header
-
+- auto-detection of --with-cpu= & --with-abi=
 
 # Helpful Resources/Websites
 - POSIX C99 compiler    - https://pubs.opengroup.org/onlinepubs/9699919799/utilities/c99.html

include/ir.h

@@ -167,7 +167,7 @@ typedef struct ir_node {
       } iicast;
       struct {
          istr_t name;
-         ir_reg_t dest;             // only used with IR_IFCALL
+         ir_reg_t dest;
          struct ir_node** params;
       } ifcall;
       struct {

src/riscv/builtins.c

@@ -13,10 +13,10 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+#include "riscv/regs.h"
 #include "config.h"
 #include "target.h"
 #include "error.h"
-#include "regs.h"
 
 // 16 - REGSIZE
 #if BITS == 32

src/riscv/common.c

@@ -17,10 +17,11 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include <stdio.h>
+#include "riscv/regs.h"
 #include "riscv/cpu.h"
+#include "cmdline.h"
 #include "target.h"
 #include "error.h"
-#include "regs.h"
 #include "config.h"
 
 struct machine_option mach_opts[] = {

src/riscv/emit_ir.c

@@ -14,11 +14,11 @@
 //  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 #include <string.h>
+#include "riscv/emit_ir.h"
+#include "riscv/regs.h"
 #include "riscv/cpu.h"
-#include "emit_ir.h"
 #include "strdb.h"
 #include "error.h"
-#include "regs.h"
 #include "bcc.h"
 
 static uintreg_t size_stack;

src/riscv/optim.c

@@ -20,6 +20,7 @@
 #include "error.h"
 
 // Turn IR_MUL to IR_IFCALL (if no M extension)
+// TODO: implement the functions in libbcc first
 static bool mul_to_func(ir_node_t** n) {
    if (riscv_cpu.has_mult)
       return false;
@@ -100,10 +101,48 @@ static bool mul_to_func(ir_node_t** n) {
    return success;
 }
 
+static bool copy_to_memcpy(ir_node_t** n) {
+   bool success = false;
+   for (ir_node_t* cur = *n; cur; cur = cur->next) {
+      if (cur->type != IR_COPY)
+         continue;
+      ir_node_t fcall;
+      fcall.type = IR_FCALL;
+      fcall.prev = cur->prev;
+      fcall.next = cur->next;
+      fcall.func = cur->func;
+
+      fcall.ifcall.name = strint("memcpy");
+      fcall.ifcall.dest = cur->copy.dest;
+      fcall.ifcall.params = NULL;
+
+      ir_node_t* param = new_node(IR_MOVE);
+      param->move.dest = fcall.ifcall.dest;
+      param->move.src  = cur->copy.dest;
+      param->move.size = IRS_PTR;
+      buf_push(fcall.ifcall.params, param);
+
+      param = new_node(IR_MOVE);
+      param->move.dest = fcall.ifcall.dest;
+      param->move.src  = cur->copy.src;
+      param->move.size = IRS_PTR;
+      buf_push(fcall.ifcall.params, param);
+
+      param = new_node(IR_LOAD);
+      param->load.dest = fcall.ifcall.dest;
+      param->load.value = cur->copy.len;
+      param->load.value = IRS_PTR;
+      buf_push(fcall.ifcall.params, param);
+      *cur = fcall;
+      success = true;
+   }
+   return success;
+}
+
 // TODO: implement target-specific IR optimizations
 bool target_optim_ir(ir_node_t** n) {
    bool success = false;
-   while (mul_to_func(n))
+   while (copy_to_memcpy(n))
       success = true;
    return success;
 }

src/x86/target.c

@@ -93,7 +93,6 @@ const struct target_info target_info = {
    .max_immed = INT64_MAX,
    .min_immed = INT64_MIN,
 #endif
-
 };
 
 #if BITS == 32

test2/Makefile

@@ -58,7 +58,7 @@ test: test.asm
 
 else ifeq ($(ARCH),riscv)
 
-test: test.asm
+test: test.s
 	$(BCC) -o $@ $< $(BCCFLAGS)
 
 test.s: test.c $(BCC)

test2/test.c

@@ -1,11 +1,9 @@
 #include <stddef.h>
 
-struct A {
-   int a;
-   int b;
-};
+int puts(const char*);
 
-int main() {
-   struct A a;
-   return sizeof(a);
+int main(void) {
+   char str[] = "Hello World";
+   puts(str);
+   return 0;
 }

util/fix_crts.sh

@@ -34,6 +34,7 @@ unset args
 
 target="${MACHTYPE}"
 GCC="${MACHTYPE}-gcc"
+BCC="bcc"
 force=0
 fix_all=0
 search_files=""
@@ -76,6 +77,7 @@ while true; do
       ;;
    -t)
       target="$2"
+      BCC="${target}-bcc"
       shift 2
       ;;
    -g)
@@ -103,7 +105,7 @@ fi
 [ -z "$1" ] && error "operand prefix is missing"
 prefix="$1"
 libdir="${prefix}/${target}/lib"
-bcc="${prefix}/bin/bcc"
+bcc="${prefix}/bin/${BCC}"
 [ ! -x "${bcc}" ] && error "couldn't to find bcc"
 version="$("${bcc}" -dumpversion)" || error "failed to get bcc's version"
 clibdir="${prefix}/lib/bcc/${target}/${version}"