Kconfig

@@ -11,6 +11,8 @@ config ISA_riscv32
   bool "riscv32"
 config ISA_riscv64
   bool "riscv64"
+config ISA_loongarch32r
+  bool "loongarch32r"
 endchoice
 
 config ISA
@@ -19,6 +21,7 @@ config ISA
   default "mips32" if ISA_mips32
   default "riscv32" if ISA_riscv32
   default "riscv64" if ISA_riscv64
+  default "loongarch32r" if ISA_loongarch32r
   default "none"
 
 config ISA64

configs/mips32-am_defconfig

@@ -0,0 +1,5 @@
+CONFIG_ISA_mips32=y
+CONFIG_TARGET_AM=y
+# CONFIG_TRACE is not set
+CONFIG_MSIZE=0x2000000
+CONFIG_DEVICE=y

configs/riscv32-am_defconfig

@@ -1,3 +1,4 @@
 CONFIG_TARGET_AM=y
+# CONFIG_TRACE is not set
 CONFIG_MSIZE=0x2000000
 CONFIG_DEVICE=y

configs/riscv64-am_defconfig

@@ -1,4 +1,5 @@
 CONFIG_ISA_riscv64=y
 CONFIG_TARGET_AM=y
+# CONFIG_TRACE is not set
 CONFIG_MSIZE=0x2000000
 CONFIG_DEVICE=y

include/common.h

@@ -17,6 +17,7 @@
 #define __COMMON_H__
 
 #include <stdint.h>
+#include <inttypes.h>
 #include <stdbool.h>
 #include <string.h>
 
@@ -36,11 +37,11 @@
 
 typedef MUXDEF(CONFIG_ISA64, uint64_t, uint32_t) word_t;
 typedef MUXDEF(CONFIG_ISA64, int64_t, int32_t)  sword_t;
-#define FMT_WORD MUXDEF(CONFIG_ISA64, "0x%016lx", "0x%08x")
+#define FMT_WORD MUXDEF(CONFIG_ISA64, "0x%016" PRIx64, "0x%08" PRIx32)
 
 typedef word_t vaddr_t;
 typedef MUXDEF(PMEM64, uint64_t, uint32_t) paddr_t;
-#define FMT_PADDR MUXDEF(PMEM64, "0x%016lx", "0x%08x")
+#define FMT_PADDR MUXDEF(PMEM64, "0x%016" PRIx64, "0x%08" PRIx32)
 typedef uint16_t ioaddr_t;
 
 #include <debug.h>

include/cpu/decode.h

@@ -90,7 +90,7 @@ static inline void pattern_decode_hex(const char *str, int len,
 #define INSTPAT(pattern, ...) do { \
   uint64_t key, mask, shift; \
   pattern_decode(pattern, STRLEN(pattern), &key, &mask, &shift); \
-  if (((INSTPAT_INST(s) >> shift) & mask) == key) { \
+  if ((((uint64_t)INSTPAT_INST(s) >> shift) & mask) == key) { \
     INSTPAT_MATCH(s, ##__VA_ARGS__); \
     goto *(__instpat_end); \
   } \

include/difftest-def.h

@@ -19,16 +19,19 @@
 #include <stdint.h>
 #include <generated/autoconf.h>
 
+#define __EXPORT __attribute__((visibility("default")))
 enum { DIFFTEST_TO_DUT, DIFFTEST_TO_REF };
 
 #if defined(CONFIG_ISA_x86)
 # define DIFFTEST_REG_SIZE (sizeof(uint32_t) * 9) // GPRs + pc
 #elif defined(CONFIG_ISA_mips32)
-# define DIFFTEST_REG_SIZE (sizeof(uint32_t) * 38) // GRPs + status + lo + hi + badvaddr + cause + pc
+# define DIFFTEST_REG_SIZE (sizeof(uint32_t) * 38) // GPRs + status + lo + hi + badvaddr + cause + pc
 #elif defined(CONFIG_ISA_riscv32)
-# define DIFFTEST_REG_SIZE (sizeof(uint32_t) * 33) // GRPs + pc
+# define DIFFTEST_REG_SIZE (sizeof(uint32_t) * 33) // GPRs + pc
 #elif defined(CONFIG_ISA_riscv64)
-# define DIFFTEST_REG_SIZE (sizeof(uint64_t) * 33) // GRPs + pc
+# define DIFFTEST_REG_SIZE (sizeof(uint64_t) * 33) // GPRs + pc
+#elif defined(CONFIG_ISA_loongarch32r)
+# define DIFFTEST_REG_SIZE (sizeof(uint32_t) * 33) // GPRs + pc
 #else
 # error Unsupport ISA
 #endif

include/memory/paddr.h

@@ -18,15 +18,17 @@
 
 #include <common.h>
 
-#define RESET_VECTOR (CONFIG_MBASE + CONFIG_PC_RESET_OFFSET)
+#define PMEM_LEFT  ((paddr_t)CONFIG_MBASE)
+#define PMEM_RIGHT ((paddr_t)CONFIG_MBASE + CONFIG_MSIZE - 1)
+#define RESET_VECTOR (PMEM_LEFT + CONFIG_PC_RESET_OFFSET)
 
 /* convert the guest physical address in the guest program to host virtual address in NEMU */
 uint8_t* guest_to_host(paddr_t paddr);
 /* convert the host virtual address in NEMU to guest physical address in the guest program */
 paddr_t host_to_guest(uint8_t *haddr);
 
 static inline bool in_pmem(paddr_t addr) {
-  return (addr >= CONFIG_MBASE) && (addr - CONFIG_MSIZE < (paddr_t)CONFIG_MBASE);
+  return addr - CONFIG_MBASE < CONFIG_MSIZE;
 }
 
 word_t paddr_read(paddr_t addr, int len);

resource/debian/README.md

@@ -42,12 +42,24 @@ sudo chroot /mnt /bin/bash
 * 安装所需工具(根据实际情况选择)
 ```
 apt-get update
+apt-get install systemd
 apt-get install gcc build-essential
 apt-get install tmux libreadline-dev
 apt-get install net-tools openssh-server
 # fix long delay of openssh server
 apt-get install haveged
-agt-get install sbt
+apt-get install sbt
+```
+
+* 修复`NO_PUBKEY E852514F5DF312F6`错误, 见[这里](https://www.reddit.com/r/RISCV/comments/sn0cph/sipeed_debian_the_following_signatures_couldnt_be/)
+```
+curl https://www.ports.debian.org/archive_2022.key | apt-key add -
+```
+
+* 同步时间
+```
+apt-get install ntpdate
+ntpdate 0.asia.pool.ntp.org
 ```
 
 * 在`/etc/fstab`中添加swap分区
@@ -156,3 +168,5 @@ sudo losetup -d /dev/loop0  # 删除loop设备
 在i9-9900k上测试, 约90s后看到debian的登录提示符.
 
 * 当以可写方式启动镜像时, NEMU遇到错误或通过Ctrl+C直接退出NEMU时, 可能会损坏镜像的崩溃一致性, 此时可以通过fsck命令修复分区.
+
+* 更多命令可参考[这里](https://github.com/carlosedp/riscv-bringup/blob/master/Debian-Rootfs-Guide.md).

scripts/build.mk

@@ -3,8 +3,8 @@
 # Add necessary options if the target is a shared library
 ifeq ($(SHARE),1)
 SO = -so
-CFLAGS  += -fPIC
-LDFLAGS += -rdynamic -shared -fPIC
+CFLAGS  += -fPIC -fvisibility=hidden
+LDFLAGS += -shared -fPIC
 endif
 
 WORK_DIR  = $(shell pwd)

src/cpu/cpu-exec.c

@@ -61,9 +61,13 @@ static void exec_once(Decode *s, vaddr_t pc) {
   memset(p, ' ', space_len);
   p += space_len;
 
+#ifndef CONFIG_ISA_loongarch32r
   void disassemble(char *str, int size, uint64_t pc, uint8_t *code, int nbyte);
   disassemble(p, s->logbuf + sizeof(s->logbuf) - p,
       MUXDEF(CONFIG_ISA_x86, s->snpc, s->pc), (uint8_t *)&s->isa.inst.val, ilen);
+#else
+  p[0] = '\0'; // the upstream llvm does not support loongarch32r
+#endif
 #endif
 }
 
@@ -80,7 +84,7 @@ static void execute(uint64_t n) {
 
 static void statistic() {
   IFNDEF(CONFIG_TARGET_AM, setlocale(LC_NUMERIC, ""));
-#define NUMBERIC_FMT MUXDEF(CONFIG_TARGET_AM, "%ld", "%'ld")
+#define NUMBERIC_FMT MUXDEF(CONFIG_TARGET_AM, "%", "%'") PRIu64
   Log("host time spent = " NUMBERIC_FMT " us", g_timer);
   Log("total guest instructions = " NUMBERIC_FMT, g_nr_guest_inst);
   if (g_timer > 0) Log("simulation frequency = " NUMBERIC_FMT " inst/s", g_nr_guest_inst * 1000000 / g_timer);

src/cpu/difftest/ref.c

@@ -18,23 +18,25 @@
 #include <difftest-def.h>
 #include <memory/paddr.h>
 
-void difftest_memcpy(paddr_t addr, void *buf, size_t n, bool direction) {
+__EXPORT void difftest_memcpy(paddr_t addr, void *buf, size_t n, bool direction) {
   assert(0);
 }
 
-void difftest_regcpy(void *dut, bool direction) {
+__EXPORT void difftest_regcpy(void *dut, bool direction) {
   assert(0);
 }
 
-void difftest_exec(uint64_t n) {
+__EXPORT void difftest_exec(uint64_t n) {
   assert(0);
 }
 
-void difftest_raise_intr(word_t NO) {
+__EXPORT void difftest_raise_intr(word_t NO) {
   assert(0);
 }
 
-void difftest_init(int port) {
+__EXPORT void difftest_init(int port) {
+  void init_mem();
+  init_mem();
   /* Perform ISA dependent initialization. */
   init_isa();
 }

src/device/io/mmio.c

@@ -14,6 +14,7 @@
 ***************************************************************************************/
 
 #include <device/map.h>
+#include <memory/paddr.h>
 
 #define NR_MAP 16
 
@@ -25,9 +26,25 @@ static IOMap* fetch_mmio_map(paddr_t addr) {
   return (mapid == -1 ? NULL : &maps[mapid]);
 }
 
+static void report_mmio_overlap(const char *name1, paddr_t l1, paddr_t r1,
+    const char *name2, paddr_t l2, paddr_t r2) {
+  panic("MMIO region %s@[" FMT_PADDR ", " FMT_PADDR "] is overlapped "
+               "with %s@[" FMT_PADDR ", " FMT_PADDR "]", name1, l1, r1, name2, l2, r2);
+}
+
 /* device interface */
 void add_mmio_map(const char *name, paddr_t addr, void *space, uint32_t len, io_callback_t callback) {
   assert(nr_map < NR_MAP);
+  paddr_t left = addr, right = addr + len - 1;
+  if (in_pmem(left) || in_pmem(right)) {
+    report_mmio_overlap(name, left, right, "pmem", PMEM_LEFT, PMEM_RIGHT);
+  }
+  for (int i = 0; i < nr_map; i++) {
+    if (left <= maps[i].high && right >= maps[i].low) {
+      report_mmio_overlap(name, left, right, maps[i].name, maps[i].low, maps[i].high);
+    }
+  }
+
   maps[nr_map] = (IOMap){ .name = name, .low = addr, .high = addr + len - 1,
     .space = space, .callback = callback };
   Log("Add mmio map '%s' at [" FMT_PADDR ", " FMT_PADDR "]",

src/device/keyboard.c

@@ -33,6 +33,11 @@ f(UP) f(DOWN) f(LEFT) f(RIGHT) f(INSERT) f(DELETE) f(HOME) f(END) f(PAGEUP) f(PA
 
 #define _KEY_NAME(k) _KEY_##k,
 
+// It's conflicted on macos with sys/_types/_key_t.h
+#ifdef __APPLE__
+  #undef _KEY_T 
+#endif
+
 enum {
   _KEY_NONE = 0,
   MAP(_KEYS, _KEY_NAME)

src/isa/loongarch32r/difftest/dut.c

@@ -0,0 +1,25 @@
+/***************************************************************************************
+* Copyright (c) 2014-2022 Zihao Yu, Nanjing University
+*
+* NEMU is licensed under Mulan PSL v2.
+* You can use this software according to the terms and conditions of the Mulan PSL v2.
+* You may obtain a copy of Mulan PSL v2 at:
+*          http://license.coscl.org.cn/MulanPSL2
+*
+* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+*
+* See the Mulan PSL v2 for more details.
+***************************************************************************************/
+
+#include <isa.h>
+#include <cpu/difftest.h>
+#include "../local-include/reg.h"
+
+bool isa_difftest_checkregs(CPU_state *ref_r, vaddr_t pc) {
+  return false;
+}
+
+void isa_difftest_attach() {
+}

src/isa/loongarch32r/include/isa-def.h

@@ -0,0 +1,35 @@
+/***************************************************************************************
+* Copyright (c) 2014-2022 Zihao Yu, Nanjing University
+*
+* NEMU is licensed under Mulan PSL v2.
+* You can use this software according to the terms and conditions of the Mulan PSL v2.
+* You may obtain a copy of Mulan PSL v2 at:
+*          http://license.coscl.org.cn/MulanPSL2
+*
+* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+*
+* See the Mulan PSL v2 for more details.
+***************************************************************************************/
+
+#ifndef __ISA_LOONGARCH32R_H__
+#define __ISA_LOONGARCH32R_H__
+
+#include <common.h>
+
+typedef struct {
+  word_t gpr[32];
+  vaddr_t pc;
+} loongarch32r_CPU_state;
+
+// decode
+typedef struct {
+  union {
+    uint32_t val;
+  } inst;
+} loongarch32r_ISADecodeInfo;
+
+#define isa_mmu_check(vaddr, len, type) (MMU_DIRECT)
+
+#endif

src/isa/loongarch32r/init.c

@@ -0,0 +1,43 @@
+/***************************************************************************************
+* Copyright (c) 2014-2022 Zihao Yu, Nanjing University
+*
+* NEMU is licensed under Mulan PSL v2.
+* You can use this software according to the terms and conditions of the Mulan PSL v2.
+* You may obtain a copy of Mulan PSL v2 at:
+*          http://license.coscl.org.cn/MulanPSL2
+*
+* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+*
+* See the Mulan PSL v2 for more details.
+***************************************************************************************/
+
+#include <isa.h>
+#include <memory/paddr.h>
+
+// this is not consistent with uint8_t
+// but it is ok since we do not access the array directly
+static const uint32_t img [] = {
+  0x1c00000c,  // pcaddu12i $t0,0
+  0x29804180,  // st.w $zero,$t0,16
+  0x28804184,  // ld.w $a0,$t0,16
+  0x002a0000,  // break 0 (used as nemu_trap)
+  0xdeadbeef,  // some data
+};
+
+static void restart() {
+  /* Set the initial program counter. */
+  cpu.pc = RESET_VECTOR;
+
+  /* The zero register is always 0. */
+  cpu.gpr[0] = 0;
+}
+
+void init_isa() {
+  /* Load built-in image. */
+  memcpy(guest_to_host(RESET_VECTOR), img, sizeof(img));
+
+  /* Initialize this virtual computer system. */
+  restart();
+}