Merge branch 'main' of github.com:bLueriVerLHR/neulacpu

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "loongarch64-linux-gnu"]
-	path = loongarch64-linux-gnu
-	url = https://gitee.com/loongarch_community/loongarch64-linux-gnu
 [submodule "nscscc-team-la32r"]
 	path = nscscc-team-la32r
 	url = https://gitee.com/loongson-edu/nscscc-team-la32r

Makefile

@@ -7,30 +7,29 @@ submodue-update-init:
 
 # prepare loongarch toolchain
 
-TOOLCHAIN_PK	:= loongarch64-linux-gnu/toolchain-loongarch64-linux-gnu-gcc8-host-x86_64-2022-07-18.tar.xz
+TOOLCHAIN_URL	:= https://gitee.com/loongson-edu/la32r-toolchains/releases/download/v0.0.2/loongarch32r-linux-gnusf-2022-05-20-x86.tar.gz
+LA_GDB_URL		:= https://gitee.com/loongson-edu/la32r-toolchains/releases/download/v0.0.2/loongarch32r-linux-gnusf-gdb-x86
 
-LA_PATH			:= ext/toolchain-loongarch64-linux-gnu-gcc8-host-x86_64-2022-07-18/bin
+TOOLCHAIN_TAR	:= $(notdir $(TOOLCHAIN_URL))
-LA_ARCH			:= loongarch64-linux-gnu-
+LA_GDB_TAR		:= $(notdir $(LA_GDB_URL))
-LA				:= $(LA_PATH)/$(LA_ARCH)
 
-GCC				:= $(LA)gcc
+ext/$(TOOLCHAIN_TAR):
-OD				:= $(LA)objdump
+	wget $(TOOLCHAIN_URL)
-OC				:= $(LA)objcopy
+	tar -zxvf $(notdir $@)
-RE				:= $(LA)readelf
+	mv loongarch32r-linux-gnusf-* ext
 
-LA_TOOLS		:= $(GCC) $(OD) $(OC) $(RE)
+lagcc: ext/$(TOOLCHAIN_TAR)
 
-unpk-gcc: submodue-update-init
+LA_ARCH			:= loongarch32r-linux-gnusf-
-	mkdir -p ext
-	tar -xvf $(TOOLCHAIN_PK) -C ext
-
-$(LA_TOOLS): unpk-gcc
 
 # prepare loongarch source code
 
-xv6:
+xv6: lagcc
-	TOOLPREFIX=$(CURDIR)/$(LA) $(MAKE) -C lasoft/xv6-la build
+	TOOLPREFIX=$(CURDIR)/$(shell find ext -type d -name '$(LA_ARCH)*')/bin/$(LA_ARCH) \
+	$(MAKE) -C lasoft/xv6-la build
 
 xv6-clean:
 	$(MAKE) -C lasoft/xv6-la clean
 
+clean-latc:
+	rm -r ext/*

lasoft/xv6-la/Makefile

@@ -30,25 +30,7 @@ OBJS = \
 	$K/plic.o \
 	$K/virtio_disk.o
 
-# riscv64-unknown-elf- or riscv64-linux-gnu-
+TOOLPREFIX ?= 
-# perhaps in /opt/riscv/bin
-#TOOLPREFIX = 
-
-# Try to infer the correct TOOLPREFIX if not set
-ifndef TOOLPREFIX
-TOOLPREFIX := $(shell if riscv64-unknown-elf-objdump -i 2>&1 | grep 'elf64-big' >/dev/null 2>&1; \
-	then echo 'riscv64-unknown-elf-'; \
-	elif riscv64-linux-gnu-objdump -i 2>&1 | grep 'elf64-big' >/dev/null 2>&1; \
-	then echo 'riscv64-linux-gnu-'; \
-	elif riscv64-unknown-linux-gnu-objdump -i 2>&1 | grep 'elf64-big' >/dev/null 2>&1; \
-	then echo 'riscv64-unknown-linux-gnu-'; \
-	else echo "***" 1>&2; \
-	echo "*** Error: Couldn't find a riscv64 version of GCC/binutils." 1>&2; \
-	echo "*** To turn off this error, run 'gmake TOOLPREFIX= ...'." 1>&2; \
-	echo "***" 1>&2; exit 1; fi)
-endif
-
-QEMU = qemu-system-riscv64
 
 CC = $(TOOLPREFIX)gcc
 AS = $(TOOLPREFIX)gas
@@ -58,9 +40,10 @@ OBJDUMP = $(TOOLPREFIX)objdump
 
 CFLAGS = -Wall -Werror -O -fno-omit-frame-pointer -ggdb -gdwarf-2
 CFLAGS += -MD
-CFLAGS += -mcmodel=medany
+CFLAGS += -mcmodel=normal
-CFLAGS += -ffreestanding -fno-common -nostdlib -mno-relax
+CFLAGS += -ffreestanding -fno-common -nostdlib -mstrict-align
 CFLAGS += -I.
+CFLAGS += -mfpu=none -mabi=ilp32s -march=loongarch32r
 CFLAGS += $(shell $(CC) -fno-stack-protector -E -x c /dev/null >/dev/null 2>&1 && echo -fno-stack-protector)
 
 # Disable PIE when possible (for Ubuntu 16.10 toolchain)
@@ -79,7 +62,7 @@ $K/kernel: $(OBJS) $K/kernel.ld $U/initcode
 	$(OBJDUMP) -t $K/kernel | sed '1,/SYMBOL TABLE/d; s/ .* / /; /^$$/d' > $K/kernel.sym
 
 $U/initcode: $U/initcode.S
-	$(CC) $(CFLAGS) -march=rv64g -nostdinc -I. -Ikernel -c $U/initcode.S -o $U/initcode.o
+	$(CC) $(CFLAGS) -nostdinc -I. -Ikernel -c $U/initcode.S -o $U/initcode.o
 	$(LD) $(LDFLAGS) -N -e start -Ttext 0 -o $U/initcode.out $U/initcode.o
 	$(OBJCOPY) -S -O binary $U/initcode.out $U/initcode
 	$(OBJDUMP) -S $U/initcode.o > $U/initcode.asm
@@ -146,30 +129,5 @@ clean:
         $U/usys.S \
 	$(UPROGS)
 
-# try to generate a unique GDB port
-GDBPORT = $(shell expr `id -u` % 5000 + 25000)
-# QEMU's gdb stub command line changed in 0.11
-QEMUGDB = $(shell if $(QEMU) -help | grep -q '^-gdb'; \
-	then echo "-gdb tcp::$(GDBPORT)"; \
-	else echo "-s -p $(GDBPORT)"; fi)
-ifndef CPUS
-CPUS := 3
-endif
-
-QEMUOPTS = -machine virt -bios none -kernel $K/kernel -m 128M -smp $(CPUS) -nographic
-QEMUOPTS += -global virtio-mmio.force-legacy=false
-QEMUOPTS += -drive file=fs.img,if=none,format=raw,id=x0
-QEMUOPTS += -device virtio-blk-device,drive=x0,bus=virtio-mmio-bus.0
-
 build: $K/kernel fs.img
 
-qemu: $K/kernel fs.img
-	$(QEMU) $(QEMUOPTS)
-
-.gdbinit: .gdbinit.tmpl-riscv
-	sed "s/:1234/:$(GDBPORT)/" < $^ > $@
-
-qemu-gdb: $K/kernel .gdbinit fs.img
-	@echo "*** Now run 'gdb' in another window." 1>&2
-	$(QEMU) $(QEMUOPTS) -S $(QEMUGDB)
-

lasoft/xv6-la/kernel/entry.S

@@ -1,3 +1,4 @@
+#include "csr.h"
         # qemu -kernel loads the kernel at 0x80000000
         # and causes each hart (i.e. CPU) to jump there.
         # kernel.ld causes the following code to

lasoft/xv6-la/kernel/start.c

@@ -51,7 +51,7 @@ start()
   w_tp(id);
 
   // switch to supervisor mode and jump to main().
-  asm volatile("mret");
+  asm volatile("ertn");
 }
 
 // arrange to receive timer interrupts.