openperf/abstract-machine
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

am,mycpu: refactor directory structure

Browse source
This commit is contained in:
Zihao Yu 2021-07-13 16:20:49 +08:00
parent 1a4ad39176
commit 17037fabb0
8 changed files with 20 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
am/src/mycpu/include/mycpu.h
View file

@ -1,5 +0,0 @@
#include <klib-macros.h>
#define PMEM_SIZE (128 * 1024 * 1024)
#define PMEM_END ((uintptr_t)&_pmem_start + PMEM_SIZE)
extern char _pmem_start;

4
am/src/mycpu/ioe/input.c → am/src/mycpu/input.c
View file

@ -1,6 +1,6 @@
#include <am.h> #include <am.h>
void __am_input_keybrd(AM_INPUT_KEYBRD_T *kbd) { void __am_input_keybrd(AM_INPUT_KEYBRD_T *kbd) {
kbd->keydown = 0;
kbd->keycode = AM_KEY_NONE;
} }

0
am/src/mycpu/ioe/ioe.c → am/src/mycpu/ioe.c
View file

33
am/src/mycpu/scripts/section.ld
View file

@ -1,33 +0,0 @@
_pmem_start = 0x80000000;
ENTRY(_start)
SECTIONS {
. = _pmem_start + 0x100000;
.text : {
*(entry)
*(.text*)
}
etext = .;
_etext = .;
.rodata : {
*(.rodata*)
}
.data : {
*(.data)
}
edata = .;
_data = .;
.bss : {
_bss_start = .;
*(.bss*)
*(.sbss*)
*(.scommon)
}
_stack_top = ALIGN(0x1000);
. = _stack_top + 0x8000;
_stack_pointer = .;
end = .;
_end = .;
_heap_start = ALIGN(0x1000);
}

0
am/src/mycpu/boot/start.S → am/src/mycpu/start.S
View file

10
am/src/mycpu/ioe/timer.c → am/src/mycpu/timer.c
View file

@ -1,13 +1,17 @@
#include <am.h> #include <am.h>
void __am_timer_init() { void __am_timer_init() {
} }
void __am_timer_uptime(AM_TIMER_UPTIME_T *uptime) { void __am_timer_uptime(AM_TIMER_UPTIME_T *uptime) {
uptime->us = 0;
} }
void __am_timer_rtc(AM_TIMER_RTC_T *rtc) { void __am_timer_rtc(AM_TIMER_RTC_T *rtc) {
rtc->second = 0;
rtc->minute = 0;
rtc->hour = 0;
rtc->day = 0;
rtc->month = 0;
rtc->year = 1900;
} }

7
am/src/mycpu/trm.c
View file

@ -1,9 +1,13 @@
#include <am.h> #include <am.h>
#include <mycpu.h> #include <klib-macros.h>
extern char _heap_start; extern char _heap_start;
int main(const char *args); int main(const char *args);
extern char _pmem_start;
#define PMEM_SIZE (128 * 1024 * 1024)
#define PMEM_END ((uintptr_t)&_pmem_start + PMEM_SIZE)
Area heap = RANGE(&_heap_start, PMEM_END); Area heap = RANGE(&_heap_start, PMEM_END);
#ifndef MAINARGS #ifndef MAINARGS
#define MAINARGS "" #define MAINARGS ""
@ -11,7 +15,6 @@ Area heap = RANGE(&_heap_start, PMEM_END);
static const char mainargs[] = MAINARGS; static const char mainargs[] = MAINARGS;
void putch(char ch) { void putch(char ch) {
} }
void halt(int code) { void halt(int code) {

12
scripts/riscv64-mycpu.mk
View file

@ -4,17 +4,17 @@ CFLAGS += $(COMMON_FLAGS) -static
ASFLAGS += $(COMMON_FLAGS) -O0 ASFLAGS += $(COMMON_FLAGS) -O0
LDFLAGS += -melf64lriscv LDFLAGS += -melf64lriscv
AM_SRCS := mycpu/boot/start.S \ AM_SRCS := mycpu/start.S \
mycpu/trm.c \ mycpu/trm.c \
mycpu/ioe/timer.c \ mycpu/ioe.c \
mycpu/ioe/ioe.c \ mycpu/timer.c \
mycpu/ioe/input.c mycpu/input.c
CFLAGS += -fdata-sections -ffunction-sections CFLAGS += -fdata-sections -ffunction-sections
LDFLAGS += -T $(AM_HOME)/am/src/mycpu/scripts/section.ld LDFLAGS += -T $(AM_HOME)/scripts/platform/nemu.ld --defsym=_pmem_start=0x80000000 --defsym=_entry_offset=0x0
LDFLAGS += --gc-sections -e _start LDFLAGS += --gc-sections -e _start
CFLAGS += -DMAINARGS=\"$(mainargs)\" CFLAGS += -DMAINARGS=\"$(mainargs)\"
CFLAGS += -I$(AM_HOME)/am/src/mycpu/include .PHONY: $(AM_HOME)/am/src/mycpu/trm.c
image: $(IMAGE).elf image: $(IMAGE).elf
@$(OBJDUMP) -d $(IMAGE).elf > $(IMAGE).txt @$(OBJDUMP) -d $(IMAGE).elf > $(IMAGE).txt