RV32C Integrated

Co-authored-by: ccs100203

Author: xiaohan484

Makefile

@@ -15,6 +15,7 @@ CFLAGS += -D ENABLE_RV32M
 CFLAGS += -D ENABLE_Zicsr
 CFLAGS += -D ENABLE_Zifencei
 CFLAGS += -D ENABLE_RV32A
+CFLAGS += -D ENABLE_RV32C
 CFLAGS += -D DEFAULT_STACK_ADDR=0xFFFFF000
 
 # Experimental SDL oriented system calls
@@ -25,22 +26,11 @@ LDFLAGS += `sdl2-config --libs`
 # Whether to enable computed goto in riscv.c
 ENABLE_COMPUTED_GOTO ?= 1
 ifeq ("$(ENABLE_COMPUTED_GOTO)", "1")
-<<<<<<< HEAD
-<<<<<<< HEAD
 ifneq ($(filter $(CC), gcc clang),)
-=======
->>>>>>> Add support for clang in Makefile
-=======
-ifneq ($(filter $(CC), gcc clang),)
->>>>>>> Improve compiler support for ENABLE_COMPUTED_GOTO
 riscv.o: CFLAGS += -D ENABLE_COMPUTED_GOTO
 	ifeq ("$(CC)", "gcc")
 riscv.o: CFLAGS += -fno-gcse -fno-crossjumping 
 	endif
-<<<<<<< HEAD
-endif
-=======
->>>>>>> Add support for clang in Makefile
 endif
 endif
 
@@ -71,7 +61,7 @@ OBJS = \
 	elf.o \
 	main.o \
 	syscall.o \
-	syscall_sdl.o
+	syscall_sdl.o 
 
 deps := $(OBJS:%.o=%.o.d)
 

elf.c

@@ -269,14 +269,17 @@ const char *elf_find_symbol(elf_t *e, uint32_t addr)
     return c_map_at_end(e->symbols, &it) ? NULL : c_map_iter_value(&it, char *);
 }
 
-bool elf_get_data_section_range(elf_t *e, uint32_t *start, uint32_t *end) {                                
+bool elf_get_data_section_range(elf_t *e, uint32_t *start, uint32_t *end)
+{
     const struct Elf32_Shdr *shdr = get_section_header(e, ".data");
-    if (!shdr) return false;
-    if (shdr->sh_type == SHT_NOBITS) return false;
+    if (!shdr)
+        return false;
+    if (shdr->sh_type == SHT_NOBITS)
+        return false;
     *start = shdr->sh_addr;
     *end = *start + shdr->sh_size;
     return true;
- }
+}
 
 bool elf_load(elf_t *e, struct riscv_t *rv, memory_t *mem)
 {

io.c

@@ -70,7 +70,12 @@ uint32_t memory_read_str(memory_t *m, uint8_t *dst, uint32_t addr, uint32_t max)
 uint32_t memory_read_ifetch(memory_t *m, uint32_t addr)
 {
     const uint32_t addr_lo = addr & mask_lo;
+
+#ifdef ENABLE_RV32C
+    assert((addr_lo & 1) == 0);
+#else
     assert((addr_lo & 3) == 0);
+#endif
 
     chunk_t *c = m->chunks[addr >> 16];
     assert(c);
@@ -115,6 +120,14 @@ uint8_t memory_read_b(memory_t *m, uint32_t addr)
 
 void memory_write(memory_t *m, uint32_t addr, const uint8_t *src, uint32_t size)
 {
+    uint32_t p = addr + size;
+    uint32_t x = p >> 16;
+    chunk_t *c = m->chunks[x];
+    if (!c) {
+        c = malloc(sizeof(chunk_t));
+        memset(c->data, 0, sizeof(c->data));
+        m->chunks[x] = c;
+    }
     for (uint32_t i = 0; i < size; ++i) {
         uint32_t p = addr + i;
         uint32_t x = p >> 16;
@@ -126,6 +139,14 @@ void memory_write(memory_t *m, uint32_t addr, const uint8_t *src, uint32_t size)
         }
         c->data[p & 0xffff] = src[i];
     }
+    p = addr + size;
+    x = p >> 16;
+    c = m->chunks[x];
+    if (!c) {
+        c = malloc(sizeof(chunk_t));
+        memset(c->data, 0, sizeof(c->data));
+        m->chunks[x] = c;
+    }
 }
 
 void memory_fill(memory_t *m, uint32_t addr, uint32_t size, uint8_t val)

main.c

@@ -69,10 +69,7 @@ static void on_on_ecall(struct riscv_t *rv)
     syscall_handler(rv);
 }
 
-static void on_on_ebreak(struct riscv_t *rv)
-{
-    rv_halt(rv);
-}
+static void on_on_ebreak(struct riscv_t *rv) {}
 
 /* run: printing out an instruction trace */
 static void run_and_trace(struct riscv_t *rv, elf_t *elf)
@@ -106,7 +103,8 @@ static void print_usage(const char *filename)
             "Usage: %s [options] [filename]\n"
             "Options:\n"
             "  --trace : print executable trace\n"
-            "  --compliance [signature filename] : dump signature to the given file for compliance test\n",
+            "  --compliance [signature filename] : dump signature to the given "
+            "file for compliance test\n",
             filename);
 }
 
@@ -127,7 +125,8 @@ static bool parse_args(int argc, char **args)
                 opt_compliance = true;
                 if (i + 1 >= argc) {
                     fprintf(stderr,
-                            "Filename for signature output required in compliance mode.\n");
+                            "Filename for signature output required in "
+                            "compliance mode.\n");
                     return false;
                 }
                 signature_out_file = args[++i];