From 31c8e838b75180e4dc4c6f0c3f1d861ccaaaa277 Mon Sep 17 00:00:00 2001 From: tracer-ics2020 Date: Sat, 4 Jan 2025 14:24:22 +0800 Subject: [PATCH 01/16] =?UTF-8?q?>=20=20compile=20201402010101=20=20Static?= =?UTF-8?q?=20hostname:=20can=20=20=20=20=20=20=20=20Icon=20name:=20comput?= =?UTF-8?q?er-laptop=20=20=20=20=20=20=20=20=20=20Chassis:=20laptop=20?= =?UTF-8?q?=F0=9F=92=BB=20=20=20=20=20=20=20Machine=20ID:=2006c3734070b740?= =?UTF-8?q?5e8db24a5b903dca16=20=20=20=20=20=20=20=20=20=20Boot=20ID:=20cd?= =?UTF-8?q?d37bb1b7c1472284c1e4b833d2b53d=20Operating=20System:=20Arch=20L?= =?UTF-8?q?inux=20=20=20=20=20=20=20=20=20=20=20Kernel:=20Linux=206.12.7-a?= =?UTF-8?q?rch1-1=20=20=20=20=20Architecture:=20x86-64=20=20Hardware=20Ven?= =?UTF-8?q?dor:=20Dell=20Inc.=20=20=20Hardware=20Model:=20Inspiron=205490?= =?UTF-8?q?=20Firmware=20Version:=201.9.0=20=20=20=20Firmware=20Date:=20We?= =?UTF-8?q?d=202020-06-17=20=20=20=20=20Firmware=20Age:=204y=206month=202w?= =?UTF-8?q?=204d=20=2014:24:22=20up=201=20day,=2026=20min,=20=201=20user,?= =?UTF-8?q?=20=20load=20average:=201.58,=200.74,=200.37?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- navy-apps/libs/libos/src/syscall.c | 3 +++ nemu/tools/gen-expr/gen-expr.c | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/navy-apps/libs/libos/src/syscall.c b/navy-apps/libs/libos/src/syscall.c index 4d733d0d..c1b9926c 100644 --- a/navy-apps/libs/libos/src/syscall.c +++ b/navy-apps/libs/libos/src/syscall.c @@ -76,6 +76,9 @@ int _write(int fd, void* buf, size_t count) { extern char _end; static char* proc_brk = &_end; void* _sbrk(intptr_t increment) { + char tmp[69] = {}; + sprintf(tmp, "prock_brk == %p\n", proc_brk); + write(1, tmp, sizeof(tmp)); intptr_t pre_brk = (intptr_t)proc_brk; intptr_t req_brk = (intptr_t)proc_brk + increment; // Attention for the argument passed to the system call. diff --git a/nemu/tools/gen-expr/gen-expr.c b/nemu/tools/gen-expr/gen-expr.c index 5f14356b..228401d1 100644 --- a/nemu/tools/gen-expr/gen-expr.c +++ b/nemu/tools/gen-expr/gen-expr.c @@ -79,9 +79,12 @@ static inline void gen_rand_op() { gen_rand_expr(); break; } - } else { - gen_rand_num(); - } + } + /* + *else { + * gen_rand_num(); + *} + */ buf[strlen(buf)] = '\0'; } From f92345713754e604e38946c9f6743d40096fde9b Mon Sep 17 00:00:00 2001 From: tracer-ics2020 Date: Sat, 4 Jan 2025 14:24:23 +0800 Subject: [PATCH 02/16] =?UTF-8?q?>=20=20run=20201402010101=20=20Static=20h?= =?UTF-8?q?ostname:=20can=20=20=20=20=20=20=20=20Icon=20name:=20computer-l?= =?UTF-8?q?aptop=20=20=20=20=20=20=20=20=20=20Chassis:=20laptop=20?= =?UTF-8?q?=F0=9F=92=BB=20=20=20=20=20=20=20Machine=20ID:=2006c3734070b740?= =?UTF-8?q?5e8db24a5b903dca16=20=20=20=20=20=20=20=20=20=20Boot=20ID:=20cd?= =?UTF-8?q?d37bb1b7c1472284c1e4b833d2b53d=20Operating=20System:=20Arch=20L?= =?UTF-8?q?inux=20=20=20=20=20=20=20=20=20=20=20Kernel:=20Linux=206.12.7-a?= =?UTF-8?q?rch1-1=20=20=20=20=20Architecture:=20x86-64=20=20Hardware=20Ven?= =?UTF-8?q?dor:=20Dell=20Inc.=20=20=20Hardware=20Model:=20Inspiron=205490?= =?UTF-8?q?=20Firmware=20Version:=201.9.0=20=20=20=20Firmware=20Date:=20We?= =?UTF-8?q?d=202020-06-17=20=20=20=20=20Firmware=20Age:=204y=206month=202w?= =?UTF-8?q?=204d=20=2014:24:23=20up=201=20day,=2026=20min,=20=201=20user,?= =?UTF-8?q?=20=20load=20average:=201.54,=200.74,=200.37?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From cc7184c1b9a6812e1cd6856b5b535913df4349a7 Mon Sep 17 00:00:00 2001 From: tracer-ics2020 Date: Sat, 4 Jan 2025 14:31:56 +0800 Subject: [PATCH 03/16] =?UTF-8?q?>=20=20run=20201402010101=20=20Static=20h?= =?UTF-8?q?ostname:=20can=20=20=20=20=20=20=20=20Icon=20name:=20computer-l?= =?UTF-8?q?aptop=20=20=20=20=20=20=20=20=20=20Chassis:=20laptop=20?= =?UTF-8?q?=F0=9F=92=BB=20=20=20=20=20=20=20Machine=20ID:=2006c3734070b740?= =?UTF-8?q?5e8db24a5b903dca16=20=20=20=20=20=20=20=20=20=20Boot=20ID:=20cd?= =?UTF-8?q?d37bb1b7c1472284c1e4b833d2b53d=20Operating=20System:=20Arch=20L?= =?UTF-8?q?inux=20=20=20=20=20=20=20=20=20=20=20Kernel:=20Linux=206.12.7-a?= =?UTF-8?q?rch1-1=20=20=20=20=20Architecture:=20x86-64=20=20Hardware=20Ven?= =?UTF-8?q?dor:=20Dell=20Inc.=20=20=20Hardware=20Model:=20Inspiron=205490?= =?UTF-8?q?=20Firmware=20Version:=201.9.0=20=20=20=20Firmware=20Date:=20We?= =?UTF-8?q?d=202020-06-17=20=20=20=20=20Firmware=20Age:=204y=206month=202w?= =?UTF-8?q?=204d=20=2014:31:56=20up=201=20day,=2034=20min,=20=201=20user,?= =?UTF-8?q?=20=20load=20average:=200.65,=200.46,=200.34?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nanos-lite/src/mm.c | 2 +- nanos-lite/src/syscall.c | 1 + navy-apps/libs/libos/src/syscall.c | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/nanos-lite/src/mm.c b/nanos-lite/src/mm.c index dca792b7..5cc5fe4d 100644 --- a/nanos-lite/src/mm.c +++ b/nanos-lite/src/mm.c @@ -29,7 +29,7 @@ void free_page(void *p) { // if brk exceed current->max_brk, we allocate new_page() void map(AddrSpace* as, void* va, void* pa, int prot); int mm_brk(uintptr_t brk) { - printf("brk == %x\n", brk); + printf("mm_brk, brk == %x\n", brk); printf("current->max_brk == %x\n", current->max_brk); if(brk > current->max_brk){ uintptr_t vaddr = current->max_brk; diff --git a/nanos-lite/src/syscall.c b/nanos-lite/src/syscall.c index 04099051..8fc58735 100644 --- a/nanos-lite/src/syscall.c +++ b/nanos-lite/src/syscall.c @@ -41,6 +41,7 @@ void do_syscall(Context* c) { } case SYS_brk: //c->GPRx = 0; + printf("nanos, brk == %x\n", a[1]); c->GPRx = mm_brk(a[1]); break; case SYS_open: diff --git a/navy-apps/libs/libos/src/syscall.c b/navy-apps/libs/libos/src/syscall.c index c1b9926c..09568b05 100644 --- a/navy-apps/libs/libos/src/syscall.c +++ b/navy-apps/libs/libos/src/syscall.c @@ -77,7 +77,9 @@ extern char _end; static char* proc_brk = &_end; void* _sbrk(intptr_t increment) { char tmp[69] = {}; - sprintf(tmp, "prock_brk == %p\n", proc_brk); + sprintf(tmp, "proc_brk == %p\n", proc_brk); + write(1, tmp, sizeof(tmp)); + sprintf(tmp, "increment == %lu\n", increment); write(1, tmp, sizeof(tmp)); intptr_t pre_brk = (intptr_t)proc_brk; intptr_t req_brk = (intptr_t)proc_brk + increment; @@ -86,6 +88,8 @@ void* _sbrk(intptr_t increment) { return (void*)-1; } + sprintf(tmp, "req_brk == %lu\n", req_brk); + write(1, tmp, sizeof(tmp)); if(!_syscall_(SYS_brk, (intptr_t)&req_brk, 0, 0)){ proc_brk += increment; return (void*)pre_brk; From 654cf69c8a90c0cc64125f42adf783498d873ef1 Mon Sep 17 00:00:00 2001 From: tracer-ics2020 Date: Sat, 4 Jan 2025 14:43:40 +0800 Subject: [PATCH 04/16] =?UTF-8?q?>=20=20run=20201402010101=20=20Static=20h?= =?UTF-8?q?ostname:=20can=20=20=20=20=20=20=20=20Icon=20name:=20computer-l?= =?UTF-8?q?aptop=20=20=20=20=20=20=20=20=20=20Chassis:=20laptop=20?= =?UTF-8?q?=F0=9F=92=BB=20=20=20=20=20=20=20Machine=20ID:=2006c3734070b740?= =?UTF-8?q?5e8db24a5b903dca16=20=20=20=20=20=20=20=20=20=20Boot=20ID:=20cd?= =?UTF-8?q?d37bb1b7c1472284c1e4b833d2b53d=20Operating=20System:=20Arch=20L?= =?UTF-8?q?inux=20=20=20=20=20=20=20=20=20=20=20Kernel:=20Linux=206.12.7-a?= =?UTF-8?q?rch1-1=20=20=20=20=20Architecture:=20x86-64=20=20Hardware=20Ven?= =?UTF-8?q?dor:=20Dell=20Inc.=20=20=20Hardware=20Model:=20Inspiron=205490?= =?UTF-8?q?=20Firmware=20Version:=201.9.0=20=20=20=20Firmware=20Date:=20We?= =?UTF-8?q?d=202020-06-17=20=20=20=20=20Firmware=20Age:=204y=206month=202w?= =?UTF-8?q?=204d=20=2014:43:40=20up=201=20day,=2046=20min,=20=201=20user,?= =?UTF-8?q?=20=20load=20average:=201.89,=200.66,=200.38?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- navy-apps/libs/libos/src/syscall.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/navy-apps/libs/libos/src/syscall.c b/navy-apps/libs/libos/src/syscall.c index 09568b05..678c653b 100644 --- a/navy-apps/libs/libos/src/syscall.c +++ b/navy-apps/libs/libos/src/syscall.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include "syscall.h" @@ -79,17 +80,19 @@ void* _sbrk(intptr_t increment) { char tmp[69] = {}; sprintf(tmp, "proc_brk == %p\n", proc_brk); write(1, tmp, sizeof(tmp)); + memset(tmp, 0, 69); sprintf(tmp, "increment == %lu\n", increment); write(1, tmp, sizeof(tmp)); intptr_t pre_brk = (intptr_t)proc_brk; intptr_t req_brk = (intptr_t)proc_brk + increment; + memset(tmp, 0, 69); + sprintf(tmp, "req_brk == %lu\n", req_brk); + write(1, tmp, sizeof(tmp)); // Attention for the argument passed to the system call. if((char *)req_brk < &_end){ return (void*)-1; } - sprintf(tmp, "req_brk == %lu\n", req_brk); - write(1, tmp, sizeof(tmp)); if(!_syscall_(SYS_brk, (intptr_t)&req_brk, 0, 0)){ proc_brk += increment; return (void*)pre_brk; From 2414b3b04199c8c4a2f1b37f3de9071ff1860c17 Mon Sep 17 00:00:00 2001 From: tracer-ics2020 Date: Sat, 4 Jan 2025 14:46:47 +0800 Subject: [PATCH 05/16] =?UTF-8?q?>=20=20run=20201402010101=20=20Static=20h?= =?UTF-8?q?ostname:=20can=20=20=20=20=20=20=20=20Icon=20name:=20computer-l?= =?UTF-8?q?aptop=20=20=20=20=20=20=20=20=20=20Chassis:=20laptop=20?= =?UTF-8?q?=F0=9F=92=BB=20=20=20=20=20=20=20Machine=20ID:=2006c3734070b740?= =?UTF-8?q?5e8db24a5b903dca16=20=20=20=20=20=20=20=20=20=20Boot=20ID:=20cd?= =?UTF-8?q?d37bb1b7c1472284c1e4b833d2b53d=20Operating=20System:=20Arch=20L?= =?UTF-8?q?inux=20=20=20=20=20=20=20=20=20=20=20Kernel:=20Linux=206.12.7-a?= =?UTF-8?q?rch1-1=20=20=20=20=20Architecture:=20x86-64=20=20Hardware=20Ven?= =?UTF-8?q?dor:=20Dell=20Inc.=20=20=20Hardware=20Model:=20Inspiron=205490?= =?UTF-8?q?=20Firmware=20Version:=201.9.0=20=20=20=20Firmware=20Date:=20We?= =?UTF-8?q?d=202020-06-17=20=20=20=20=20Firmware=20Age:=204y=206month=202w?= =?UTF-8?q?=204d=20=2014:46:47=20up=201=20day,=2049=20min,=20=201=20user,?= =?UTF-8?q?=20=20load=20average:=202.34,=200.97,=200.52?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- navy-apps/libs/libos/src/syscall.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/navy-apps/libs/libos/src/syscall.c b/navy-apps/libs/libos/src/syscall.c index 678c653b..0ff75446 100644 --- a/navy-apps/libs/libos/src/syscall.c +++ b/navy-apps/libs/libos/src/syscall.c @@ -78,15 +78,17 @@ extern char _end; static char* proc_brk = &_end; void* _sbrk(intptr_t increment) { char tmp[69] = {}; - sprintf(tmp, "proc_brk == %p\n", proc_brk); + sprintf(tmp, "navy, proc_brk == %p\n", proc_brk); write(1, tmp, sizeof(tmp)); memset(tmp, 0, 69); - sprintf(tmp, "increment == %lu\n", increment); + sprintf(tmp, "navy, increment == %p\n", (char*)increment); + sprintf(tmp, "navy, increment == %lu\n", increment); write(1, tmp, sizeof(tmp)); intptr_t pre_brk = (intptr_t)proc_brk; intptr_t req_brk = (intptr_t)proc_brk + increment; memset(tmp, 0, 69); - sprintf(tmp, "req_brk == %lu\n", req_brk); + sprintf(tmp, "navy, req_brk == %p\n", (char*)req_brk); + sprintf(tmp, "navy, req_brk == %lu\n", req_brk); write(1, tmp, sizeof(tmp)); // Attention for the argument passed to the system call. if((char *)req_brk < &_end){ From a91b54fb97ff71d8273c5b0ed5d7f97c17e83f70 Mon Sep 17 00:00:00 2001 From: tracer-ics2020 Date: Sat, 4 Jan 2025 14:48:14 +0800 Subject: [PATCH 06/16] =?UTF-8?q?>=20=20run=20201402010101=20=20Static=20h?= =?UTF-8?q?ostname:=20can=20=20=20=20=20=20=20=20Icon=20name:=20computer-l?= =?UTF-8?q?aptop=20=20=20=20=20=20=20=20=20=20Chassis:=20laptop=20?= =?UTF-8?q?=F0=9F=92=BB=20=20=20=20=20=20=20Machine=20ID:=2006c3734070b740?= =?UTF-8?q?5e8db24a5b903dca16=20=20=20=20=20=20=20=20=20=20Boot=20ID:=20cd?= =?UTF-8?q?d37bb1b7c1472284c1e4b833d2b53d=20Operating=20System:=20Arch=20L?= =?UTF-8?q?inux=20=20=20=20=20=20=20=20=20=20=20Kernel:=20Linux=206.12.7-a?= =?UTF-8?q?rch1-1=20=20=20=20=20Architecture:=20x86-64=20=20Hardware=20Ven?= =?UTF-8?q?dor:=20Dell=20Inc.=20=20=20Hardware=20Model:=20Inspiron=205490?= =?UTF-8?q?=20Firmware=20Version:=201.9.0=20=20=20=20Firmware=20Date:=20We?= =?UTF-8?q?d=202020-06-17=20=20=20=20=20Firmware=20Age:=204y=206month=202w?= =?UTF-8?q?=204d=20=2014:48:14=20up=201=20day,=2050=20min,=20=201=20user,?= =?UTF-8?q?=20=20load=20average:=201.84,=201.13,=200.62?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From fbf93bc30cdc1b8dcfe8ac1021d4a93326858471 Mon Sep 17 00:00:00 2001 From: tracer-ics2020 Date: Sat, 4 Jan 2025 14:50:26 +0800 Subject: [PATCH 07/16] =?UTF-8?q?>=20=20run=20201402010101=20=20Static=20h?= =?UTF-8?q?ostname:=20can=20=20=20=20=20=20=20=20Icon=20name:=20computer-l?= =?UTF-8?q?aptop=20=20=20=20=20=20=20=20=20=20Chassis:=20laptop=20?= =?UTF-8?q?=F0=9F=92=BB=20=20=20=20=20=20=20Machine=20ID:=2006c3734070b740?= =?UTF-8?q?5e8db24a5b903dca16=20=20=20=20=20=20=20=20=20=20Boot=20ID:=20cd?= =?UTF-8?q?d37bb1b7c1472284c1e4b833d2b53d=20Operating=20System:=20Arch=20L?= =?UTF-8?q?inux=20=20=20=20=20=20=20=20=20=20=20Kernel:=20Linux=206.12.7-a?= =?UTF-8?q?rch1-1=20=20=20=20=20Architecture:=20x86-64=20=20Hardware=20Ven?= =?UTF-8?q?dor:=20Dell=20Inc.=20=20=20Hardware=20Model:=20Inspiron=205490?= =?UTF-8?q?=20Firmware=20Version:=201.9.0=20=20=20=20Firmware=20Date:=20We?= =?UTF-8?q?d=202020-06-17=20=20=20=20=20Firmware=20Age:=204y=206month=202w?= =?UTF-8?q?=204d=20=2014:50:26=20up=201=20day,=2052=20min,=20=201=20user,?= =?UTF-8?q?=20=20load=20average:=202.45,=201.38,=200.76?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- navy-apps/libs/libos/src/syscall.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/navy-apps/libs/libos/src/syscall.c b/navy-apps/libs/libos/src/syscall.c index 0ff75446..3ed9db97 100644 --- a/navy-apps/libs/libos/src/syscall.c +++ b/navy-apps/libs/libos/src/syscall.c @@ -82,14 +82,19 @@ void* _sbrk(intptr_t increment) { write(1, tmp, sizeof(tmp)); memset(tmp, 0, 69); sprintf(tmp, "navy, increment == %p\n", (char*)increment); + write(1, tmp, sizeof(tmp)); + memset(tmp, 0, 69); sprintf(tmp, "navy, increment == %lu\n", increment); write(1, tmp, sizeof(tmp)); + memset(tmp, 0, 69); intptr_t pre_brk = (intptr_t)proc_brk; intptr_t req_brk = (intptr_t)proc_brk + increment; - memset(tmp, 0, 69); sprintf(tmp, "navy, req_brk == %p\n", (char*)req_brk); + write(1, tmp, sizeof(tmp)); + memset(tmp, 0, 69); sprintf(tmp, "navy, req_brk == %lu\n", req_brk); write(1, tmp, sizeof(tmp)); + memset(tmp, 0, 69); // Attention for the argument passed to the system call. if((char *)req_brk < &_end){ return (void*)-1; From aba76f6265bd737f048660a6025abb3bfe43f9e9 Mon Sep 17 00:00:00 2001 From: tracer-ics2020 Date: Sat, 4 Jan 2025 15:07:28 +0800 Subject: [PATCH 08/16] =?UTF-8?q?>=20=20run=20201402010101=20=20Static=20h?= =?UTF-8?q?ostname:=20can=20=20=20=20=20=20=20=20Icon=20name:=20computer-l?= =?UTF-8?q?aptop=20=20=20=20=20=20=20=20=20=20Chassis:=20laptop=20?= =?UTF-8?q?=F0=9F=92=BB=20=20=20=20=20=20=20Machine=20ID:=2006c3734070b740?= =?UTF-8?q?5e8db24a5b903dca16=20=20=20=20=20=20=20=20=20=20Boot=20ID:=20cd?= =?UTF-8?q?d37bb1b7c1472284c1e4b833d2b53d=20Operating=20System:=20Arch=20L?= =?UTF-8?q?inux=20=20=20=20=20=20=20=20=20=20=20Kernel:=20Linux=206.12.7-a?= =?UTF-8?q?rch1-1=20=20=20=20=20Architecture:=20x86-64=20=20Hardware=20Ven?= =?UTF-8?q?dor:=20Dell=20Inc.=20=20=20Hardware=20Model:=20Inspiron=205490?= =?UTF-8?q?=20Firmware=20Version:=201.9.0=20=20=20=20Firmware=20Date:=20We?= =?UTF-8?q?d=202020-06-17=20=20=20=20=20Firmware=20Age:=204y=206month=202w?= =?UTF-8?q?=204d=20=2015:07:28=20up=201=20day,=20=201:09,=20=201=20user,?= =?UTF-8?q?=20=20load=20average:=200.34,=200.44,=200.51?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- abstract-machine/am/src/x86/nemu/cte.c | 2 ++ navy-apps/libs/libos/src/syscall.c | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/abstract-machine/am/src/x86/nemu/cte.c b/abstract-machine/am/src/x86/nemu/cte.c index 5d7993b7..e52647f3 100644 --- a/abstract-machine/am/src/x86/nemu/cte.c +++ b/abstract-machine/am/src/x86/nemu/cte.c @@ -33,6 +33,8 @@ Context* __am_irq_handle(Context* c) { ev.event = EVENT_IRQ_TIMER; break; case 0x80: + if(c->eax == 9) + printf("Int trap, a[1] == %x\n", c->ebx); ev.event = EVENT_SYSCALL; break; case 0x81: diff --git a/navy-apps/libs/libos/src/syscall.c b/navy-apps/libs/libos/src/syscall.c index 3ed9db97..84539d40 100644 --- a/navy-apps/libs/libos/src/syscall.c +++ b/navy-apps/libs/libos/src/syscall.c @@ -49,6 +49,14 @@ #endif intptr_t _syscall_(intptr_t type, intptr_t a0, intptr_t a1, intptr_t a2) { + if(type == 9){ + char tmp[69] = {}; + sprintf(tmp, "navy, brk _syscall_, brk == %p\n", (char*)a0); + write(1, tmp, sizeof(tmp)); + memset(tmp, 0, 69); + sprintf(tmp, "navy, brk _syscall_, brk == %lu\n", a0); + write(1, tmp, sizeof(tmp)); + } register intptr_t _gpr1 asm(GPR1) = type; register intptr_t _gpr2 asm(GPR2) = a0; register intptr_t _gpr3 asm(GPR3) = a1; From 4c15bfd974d39945af8c3ad753b2c162774608a2 Mon Sep 17 00:00:00 2001 From: tracer-ics2020 Date: Sat, 4 Jan 2025 15:14:03 +0800 Subject: [PATCH 09/16] =?UTF-8?q?>=20=20run=20201402010101=20=20Static=20h?= =?UTF-8?q?ostname:=20can=20=20=20=20=20=20=20=20Icon=20name:=20computer-l?= =?UTF-8?q?aptop=20=20=20=20=20=20=20=20=20=20Chassis:=20laptop=20?= =?UTF-8?q?=F0=9F=92=BB=20=20=20=20=20=20=20Machine=20ID:=2006c3734070b740?= =?UTF-8?q?5e8db24a5b903dca16=20=20=20=20=20=20=20=20=20=20Boot=20ID:=20cd?= =?UTF-8?q?d37bb1b7c1472284c1e4b833d2b53d=20Operating=20System:=20Arch=20L?= =?UTF-8?q?inux=20=20=20=20=20=20=20=20=20=20=20Kernel:=20Linux=206.12.7-a?= =?UTF-8?q?rch1-1=20=20=20=20=20Architecture:=20x86-64=20=20Hardware=20Ven?= =?UTF-8?q?dor:=20Dell=20Inc.=20=20=20Hardware=20Model:=20Inspiron=205490?= =?UTF-8?q?=20Firmware=20Version:=201.9.0=20=20=20=20Firmware=20Date:=20We?= =?UTF-8?q?d=202020-06-17=20=20=20=20=20Firmware=20Age:=204y=206month=202w?= =?UTF-8?q?=204d=20=2015:14:03=20up=201=20day,=20=201:16,=20=201=20user,?= =?UTF-8?q?=20=20load=20average:=200.21,=200.32,=200.43?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- navy-apps/libs/libos/src/syscall.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/navy-apps/libs/libos/src/syscall.c b/navy-apps/libs/libos/src/syscall.c index 84539d40..16edc9c8 100644 --- a/navy-apps/libs/libos/src/syscall.c +++ b/navy-apps/libs/libos/src/syscall.c @@ -62,6 +62,9 @@ intptr_t _syscall_(intptr_t type, intptr_t a0, intptr_t a1, intptr_t a2) { register intptr_t _gpr3 asm(GPR3) = a1; register intptr_t _gpr4 asm(GPR4) = a2; register intptr_t ret asm(GPRx); + char tmp[69] = {}; + sprintf(tmp, "navy, brk _syscall_, brk == %lu\n", _gpr2); + write(1, tmp, sizeof(tmp)); asm volatile(SYSCALL : "=r"(ret) : "r"(_gpr1), "r"(_gpr2), "r"(_gpr3), "r"(_gpr4)); From 9ee0fc80e7c9ea3ad8d3fda2885a1ee16c373f23 Mon Sep 17 00:00:00 2001 From: tracer-ics2020 Date: Sat, 4 Jan 2025 15:14:55 +0800 Subject: [PATCH 10/16] =?UTF-8?q?>=20=20run=20201402010101=20=20Static=20h?= =?UTF-8?q?ostname:=20can=20=20=20=20=20=20=20=20Icon=20name:=20computer-l?= =?UTF-8?q?aptop=20=20=20=20=20=20=20=20=20=20Chassis:=20laptop=20?= =?UTF-8?q?=F0=9F=92=BB=20=20=20=20=20=20=20Machine=20ID:=2006c3734070b740?= =?UTF-8?q?5e8db24a5b903dca16=20=20=20=20=20=20=20=20=20=20Boot=20ID:=20cd?= =?UTF-8?q?d37bb1b7c1472284c1e4b833d2b53d=20Operating=20System:=20Arch=20L?= =?UTF-8?q?inux=20=20=20=20=20=20=20=20=20=20=20Kernel:=20Linux=206.12.7-a?= =?UTF-8?q?rch1-1=20=20=20=20=20Architecture:=20x86-64=20=20Hardware=20Ven?= =?UTF-8?q?dor:=20Dell=20Inc.=20=20=20Hardware=20Model:=20Inspiron=205490?= =?UTF-8?q?=20Firmware=20Version:=201.9.0=20=20=20=20Firmware=20Date:=20We?= =?UTF-8?q?d=202020-06-17=20=20=20=20=20Firmware=20Age:=204y=206month=202w?= =?UTF-8?q?=204d=20=2015:14:55=20up=201=20day,=20=201:17,=20=201=20user,?= =?UTF-8?q?=20=20load=20average:=201.03,=200.57,=200.51?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From 6a7ad1c9fc740de9d1fc5e8f0aab1c6f005ff22f Mon Sep 17 00:00:00 2001 From: tracer-ics2020 Date: Sat, 4 Jan 2025 15:17:18 +0800 Subject: [PATCH 11/16] =?UTF-8?q?>=20=20run=20201402010101=20=20Static=20h?= =?UTF-8?q?ostname:=20can=20=20=20=20=20=20=20=20Icon=20name:=20computer-l?= =?UTF-8?q?aptop=20=20=20=20=20=20=20=20=20=20Chassis:=20laptop=20?= =?UTF-8?q?=F0=9F=92=BB=20=20=20=20=20=20=20Machine=20ID:=2006c3734070b740?= =?UTF-8?q?5e8db24a5b903dca16=20=20=20=20=20=20=20=20=20=20Boot=20ID:=20cd?= =?UTF-8?q?d37bb1b7c1472284c1e4b833d2b53d=20Operating=20System:=20Arch=20L?= =?UTF-8?q?inux=20=20=20=20=20=20=20=20=20=20=20Kernel:=20Linux=206.12.7-a?= =?UTF-8?q?rch1-1=20=20=20=20=20Architecture:=20x86-64=20=20Hardware=20Ven?= =?UTF-8?q?dor:=20Dell=20Inc.=20=20=20Hardware=20Model:=20Inspiron=205490?= =?UTF-8?q?=20Firmware=20Version:=201.9.0=20=20=20=20Firmware=20Date:=20We?= =?UTF-8?q?d=202020-06-17=20=20=20=20=20Firmware=20Age:=204y=206month=202w?= =?UTF-8?q?=204d=20=2015:17:19=20up=201=20day,=20=201:19,=20=201=20user,?= =?UTF-8?q?=20=20load=20average:=200.28,=200.44,=200.47?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- navy-apps/libs/libos/src/syscall.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/navy-apps/libs/libos/src/syscall.c b/navy-apps/libs/libos/src/syscall.c index 16edc9c8..84539d40 100644 --- a/navy-apps/libs/libos/src/syscall.c +++ b/navy-apps/libs/libos/src/syscall.c @@ -62,9 +62,6 @@ intptr_t _syscall_(intptr_t type, intptr_t a0, intptr_t a1, intptr_t a2) { register intptr_t _gpr3 asm(GPR3) = a1; register intptr_t _gpr4 asm(GPR4) = a2; register intptr_t ret asm(GPRx); - char tmp[69] = {}; - sprintf(tmp, "navy, brk _syscall_, brk == %lu\n", _gpr2); - write(1, tmp, sizeof(tmp)); asm volatile(SYSCALL : "=r"(ret) : "r"(_gpr1), "r"(_gpr2), "r"(_gpr3), "r"(_gpr4)); From 85c8b0d1e8ba7bb86fc82f89bc59a4055e50013f Mon Sep 17 00:00:00 2001 From: tracer-ics2020 Date: Sat, 4 Jan 2025 15:18:05 +0800 Subject: [PATCH 12/16] =?UTF-8?q?>=20=20run=20201402010101=20=20Static=20h?= =?UTF-8?q?ostname:=20can=20=20=20=20=20=20=20=20Icon=20name:=20computer-l?= =?UTF-8?q?aptop=20=20=20=20=20=20=20=20=20=20Chassis:=20laptop=20?= =?UTF-8?q?=F0=9F=92=BB=20=20=20=20=20=20=20Machine=20ID:=2006c3734070b740?= =?UTF-8?q?5e8db24a5b903dca16=20=20=20=20=20=20=20=20=20=20Boot=20ID:=20cd?= =?UTF-8?q?d37bb1b7c1472284c1e4b833d2b53d=20Operating=20System:=20Arch=20L?= =?UTF-8?q?inux=20=20=20=20=20=20=20=20=20=20=20Kernel:=20Linux=206.12.7-a?= =?UTF-8?q?rch1-1=20=20=20=20=20Architecture:=20x86-64=20=20Hardware=20Ven?= =?UTF-8?q?dor:=20Dell=20Inc.=20=20=20Hardware=20Model:=20Inspiron=205490?= =?UTF-8?q?=20Firmware=20Version:=201.9.0=20=20=20=20Firmware=20Date:=20We?= =?UTF-8?q?d=202020-06-17=20=20=20=20=20Firmware=20Age:=204y=206month=202w?= =?UTF-8?q?=204d=20=2015:18:05=20up=201=20day,=20=201:20,=20=201=20user,?= =?UTF-8?q?=20=20load=20average:=202.26,=201.02,=200.67?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From 754d14a6131f9ec23cb68804bc0b1b1fc5f7983c Mon Sep 17 00:00:00 2001 From: tracer-ics2020 Date: Sat, 4 Jan 2025 15:22:58 +0800 Subject: [PATCH 13/16] =?UTF-8?q?>=20=20run=20201402010101=20=20Static=20h?= =?UTF-8?q?ostname:=20can=20=20=20=20=20=20=20=20Icon=20name:=20computer-l?= =?UTF-8?q?aptop=20=20=20=20=20=20=20=20=20=20Chassis:=20laptop=20?= =?UTF-8?q?=F0=9F=92=BB=20=20=20=20=20=20=20Machine=20ID:=2006c3734070b740?= =?UTF-8?q?5e8db24a5b903dca16=20=20=20=20=20=20=20=20=20=20Boot=20ID:=20cd?= =?UTF-8?q?d37bb1b7c1472284c1e4b833d2b53d=20Operating=20System:=20Arch=20L?= =?UTF-8?q?inux=20=20=20=20=20=20=20=20=20=20=20Kernel:=20Linux=206.12.7-a?= =?UTF-8?q?rch1-1=20=20=20=20=20Architecture:=20x86-64=20=20Hardware=20Ven?= =?UTF-8?q?dor:=20Dell=20Inc.=20=20=20Hardware=20Model:=20Inspiron=205490?= =?UTF-8?q?=20Firmware=20Version:=201.9.0=20=20=20=20Firmware=20Date:=20We?= =?UTF-8?q?d=202020-06-17=20=20=20=20=20Firmware=20Age:=204y=206month=202w?= =?UTF-8?q?=204d=20=2015:22:58=20up=201=20day,=20=201:25,=20=201=20user,?= =?UTF-8?q?=20=20load=20average:=200.87,=200.95,=200.74?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- navy-apps/libs/libos/src/syscall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/navy-apps/libs/libos/src/syscall.c b/navy-apps/libs/libos/src/syscall.c index 84539d40..a5da2d50 100644 --- a/navy-apps/libs/libos/src/syscall.c +++ b/navy-apps/libs/libos/src/syscall.c @@ -108,7 +108,7 @@ void* _sbrk(intptr_t increment) { return (void*)-1; } - if(!_syscall_(SYS_brk, (intptr_t)&req_brk, 0, 0)){ + if(!_syscall_(SYS_brk, (intptr_t)req_brk, 0, 0)){ proc_brk += increment; return (void*)pre_brk; } else { From 23a17255c739e5033ef179305d2efd565b25f275 Mon Sep 17 00:00:00 2001 From: tracer-ics2020 Date: Sat, 4 Jan 2025 15:23:35 +0800 Subject: [PATCH 14/16] =?UTF-8?q?>=20=20run=20201402010101=20=20Static=20h?= =?UTF-8?q?ostname:=20can=20=20=20=20=20=20=20=20Icon=20name:=20computer-l?= =?UTF-8?q?aptop=20=20=20=20=20=20=20=20=20=20Chassis:=20laptop=20?= =?UTF-8?q?=F0=9F=92=BB=20=20=20=20=20=20=20Machine=20ID:=2006c3734070b740?= =?UTF-8?q?5e8db24a5b903dca16=20=20=20=20=20=20=20=20=20=20Boot=20ID:=20cd?= =?UTF-8?q?d37bb1b7c1472284c1e4b833d2b53d=20Operating=20System:=20Arch=20L?= =?UTF-8?q?inux=20=20=20=20=20=20=20=20=20=20=20Kernel:=20Linux=206.12.7-a?= =?UTF-8?q?rch1-1=20=20=20=20=20Architecture:=20x86-64=20=20Hardware=20Ven?= =?UTF-8?q?dor:=20Dell=20Inc.=20=20=20Hardware=20Model:=20Inspiron=205490?= =?UTF-8?q?=20Firmware=20Version:=201.9.0=20=20=20=20Firmware=20Date:=20We?= =?UTF-8?q?d=202020-06-17=20=20=20=20=20Firmware=20Age:=204y=206month=202w?= =?UTF-8?q?=204d=20=2015:23:35=20up=201=20day,=20=201:25,=20=201=20user,?= =?UTF-8?q?=20=20load=20average:=202.28,=201.32,=200.88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From 55cebed59c73ae44f43d39d2ab46a8b5b7b96413 Mon Sep 17 00:00:00 2001 From: tracer-ics2020 Date: Sat, 4 Jan 2025 15:24:23 +0800 Subject: [PATCH 15/16] =?UTF-8?q?>=20=20compile=20201402010101=20=20Static?= =?UTF-8?q?=20hostname:=20can=20=20=20=20=20=20=20=20Icon=20name:=20comput?= =?UTF-8?q?er-laptop=20=20=20=20=20=20=20=20=20=20Chassis:=20laptop=20?= =?UTF-8?q?=F0=9F=92=BB=20=20=20=20=20=20=20Machine=20ID:=2006c3734070b740?= =?UTF-8?q?5e8db24a5b903dca16=20=20=20=20=20=20=20=20=20=20Boot=20ID:=20cd?= =?UTF-8?q?d37bb1b7c1472284c1e4b833d2b53d=20Operating=20System:=20Arch=20L?= =?UTF-8?q?inux=20=20=20=20=20=20=20=20=20=20=20Kernel:=20Linux=206.12.7-a?= =?UTF-8?q?rch1-1=20=20=20=20=20Architecture:=20x86-64=20=20Hardware=20Ven?= =?UTF-8?q?dor:=20Dell=20Inc.=20=20=20Hardware=20Model:=20Inspiron=205490?= =?UTF-8?q?=20Firmware=20Version:=201.9.0=20=20=20=20Firmware=20Date:=20We?= =?UTF-8?q?d=202020-06-17=20=20=20=20=20Firmware=20Age:=204y=206month=202w?= =?UTF-8?q?=204d=20=2015:24:23=20up=201=20day,=20=201:26,=20=201=20user,?= =?UTF-8?q?=20=20load=20average:=201.49,=201.26,=200.88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nemu/src/device/intr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nemu/src/device/intr.c b/nemu/src/device/intr.c index 223fc4db..a312605e 100644 --- a/nemu/src/device/intr.c +++ b/nemu/src/device/intr.c @@ -1,5 +1,5 @@ #include void dev_raise_intr() { - //cpu.INTR = true; + cpu.INTR = true; } From 8c9b19a81f91e80978cdf82266a01ab61906be96 Mon Sep 17 00:00:00 2001 From: tracer-ics2020 Date: Sat, 4 Jan 2025 15:24:24 +0800 Subject: [PATCH 16/16] =?UTF-8?q?>=20=20run=20201402010101=20=20Static=20h?= =?UTF-8?q?ostname:=20can=20=20=20=20=20=20=20=20Icon=20name:=20computer-l?= =?UTF-8?q?aptop=20=20=20=20=20=20=20=20=20=20Chassis:=20laptop=20?= =?UTF-8?q?=F0=9F=92=BB=20=20=20=20=20=20=20Machine=20ID:=2006c3734070b740?= =?UTF-8?q?5e8db24a5b903dca16=20=20=20=20=20=20=20=20=20=20Boot=20ID:=20cd?= =?UTF-8?q?d37bb1b7c1472284c1e4b833d2b53d=20Operating=20System:=20Arch=20L?= =?UTF-8?q?inux=20=20=20=20=20=20=20=20=20=20=20Kernel:=20Linux=206.12.7-a?= =?UTF-8?q?rch1-1=20=20=20=20=20Architecture:=20x86-64=20=20Hardware=20Ven?= =?UTF-8?q?dor:=20Dell=20Inc.=20=20=20Hardware=20Model:=20Inspiron=205490?= =?UTF-8?q?=20Firmware=20Version:=201.9.0=20=20=20=20Firmware=20Date:=20We?= =?UTF-8?q?d=202020-06-17=20=20=20=20=20Firmware=20Age:=204y=206month=202w?= =?UTF-8?q?=204d=20=2015:24:24=20up=201=20day,=20=201:26,=20=201=20user,?= =?UTF-8?q?=20=20load=20average:=201.49,=201.26,=200.88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit