Update expect outputs after introducing axmm

arceos-org · Jul 29, 2024 · b36b9d5 · b36b9d5
1 parent a47dd3a
commit b36b9d5
Show file tree

Hide file tree

Showing 17 changed files with 36 additions and 34 deletions.
diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ all: build
 ax_root:
 	@./scripts/set_ax_root.sh $(AX_ROOT)
 
-build run justrun debug fmt disasm disk_img clean clean_c: ax_root
+build run justrun debug disasm disk_img clean clean_c: ax_root
 	@make -C $(AX_ROOT) A=$(APP) $@
 
 test:
@@ -23,4 +23,4 @@ else
 	@./scripts/app_test.sh
 endif
 
-.PHONY: all ax_root build run justrun debug fmt disasm disk_img clean clean_c test
+.PHONY: all ax_root build run justrun debug disasm disk_img clean clean_c test
diff --git a/c/httpclient/expect_info.out b/c/httpclient/expect_info.out
@@ -12,7 +12,7 @@ Found physcial memory regions:
  .bss (READ | WRITE | RESERVED)
  free memory (READ | WRITE | FREE)
 Initialize global memory allocator...
-Initialize kernel page table...
+Initialize virtual memory management...
 Initialize platform devices...
 Initialize device drivers...
 registered a new Net device at .\+: "virtio-net"

diff --git a/c/memtest/expect_trace.out b/c/memtest/expect_trace.out
@@ -14,16 +14,16 @@ Found physcial memory regions:
 Initialize global memory allocator...
   use TLSF allocator.
 initialize global allocator at: \[0x[0-9a-f]\+, 0x[0-9a-f]\+)
-Initialize kernel page table...
+Initialize virtual memory management...
 Initialize platform devices...
-map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) -> \[PA:0x[0-9a-f]\+, PA:0x[0-9a-f]\+) READ | EXECUTE
-map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) -> \[PA:0x[0-9a-f]\+, PA:0x[0-9a-f]\+) READ
-map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) -> \[PA:0x[0-9a-f]\+, PA:0x[0-9a-f]\+) READ | WRITE
-map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) -> \[PA:0x[0-9a-f]\+, PA:0x[0-9a-f]\+) READ | WRITE
-map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) -> \[PA:0x[0-9a-f]\+, PA:0x[0-9a-f]\+) READ | WRITE
-map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) -> \[PA:0x[0-9a-f]\+, PA:0x[0-9a-f]\+) READ | WRITE
-map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) -> \[PA:0x[0-9a-f]\+, PA:0x[0-9a-f]\+) READ | WRITE | DEVICE
-map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) -> \[PA:0x[0-9a-f]\+, PA:0x[0-9a-f]\+) READ | WRITE
+map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) READ | EXECUTE
+map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) READ
+map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) READ | WRITE
+map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) READ | WRITE
+map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) READ | WRITE
+map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) READ | WRITE
+map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) READ | WRITE | DEVICE
+map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) READ | WRITE
 set page table root: PA:0x[0-9a-f]\+ => PA:0x[0-9a-f]\+
 Primary CPU 0 init OK.
 Running memory tests...

diff --git a/c/pthread/basic/expect_info_smp4_fifo.out b/c/pthread/basic/expect_info_smp4_fifo.out
@@ -12,7 +12,7 @@ Found physcial memory regions:
  .bss (READ | WRITE | RESERVED)
  free memory (READ | WRITE | FREE)
 Initialize global memory allocator...
-Initialize kernel page table...
+Initialize virtual memory management...
 Initialize platform devices...
 Initialize scheduling...
   use FIFO scheduler.

diff --git a/c/pthread/parallel/expect_info_smp4_fifo.out b/c/pthread/parallel/expect_info_smp4_fifo.out
@@ -12,7 +12,7 @@ Found physcial memory regions:
  .bss (READ | WRITE | RESERVED)
  free memory (READ | WRITE | FREE)
 Initialize global memory allocator...
-Initialize kernel page table...
+Initialize virtual memory management...
 Initialize platform devices...
 Initialize scheduling...
  use FIFO scheduler

diff --git a/c/pthread/parallel/expect_info_smp4_rr.out b/c/pthread/parallel/expect_info_smp4_rr.out
@@ -12,7 +12,7 @@ Found physcial memory regions:
  .bss (READ | WRITE | RESERVED)
  free memory (READ | WRITE | FREE)
 Initialize global memory allocator...
-Initialize kernel page table...
+Initialize virtual memory management...
 Initialize platform devices...
 Initialize scheduling...
  use Round-robin scheduler

diff --git a/c/pthread/pipe/expect_info_smp4_fifo.out b/c/pthread/pipe/expect_info_smp4_fifo.out
@@ -12,7 +12,7 @@ Found physcial memory regions:
  .bss (READ | WRITE | RESERVED)
  free memory (READ | WRITE | FREE)
 Initialize global memory allocator...
-Initialize kernel page table...
+Initialize virtual memory management...
 Initialize platform devices...
 Initialize scheduling...
  use FIFO scheduler.

diff --git a/c/pthread/sleep/expect_info_smp4_fifo.out b/c/pthread/sleep/expect_info_smp4_fifo.out
@@ -12,7 +12,7 @@ Found physcial memory regions:
  .bss (READ | WRITE | RESERVED)
  free memory (READ | WRITE | FREE)
 Initialize global memory allocator...
-Initialize kernel page table...
+Initialize virtual memory management...
 Initialize platform devices...
 Initialize scheduling...
   use FIFO scheduler.

diff --git a/c/sqlite3/expect_info.out b/c/sqlite3/expect_info.out
@@ -12,7 +12,7 @@ Found physcial memory regions:
  .bss (READ | WRITE | RESERVED)
  free memory (READ | WRITE | FREE)
 Initialize global memory allocator...
-Initialize kernel page table...
+Initialize virtual memory management...
 Initialize platform devices...
 Initialize device drivers...
 registered a new Block device at .\+: "virtio-blk"

diff --git a/c/sqlite3/expect_info_again.out b/c/sqlite3/expect_info_again.out
@@ -12,7 +12,7 @@ Found physcial memory regions:
  .bss (READ | WRITE | RESERVED)
  free memory (READ | WRITE | FREE)
 Initialize global memory allocator...
-Initialize kernel page table...
+Initialize virtual memory management...
 Initialize platform devices...
 Initialize device drivers...
 registered a new Block device at .\+: "virtio-blk"

diff --git a/c/sqlite3/expect_info_ramdisk.out b/c/sqlite3/expect_info_ramdisk.out
@@ -12,7 +12,7 @@ Found physcial memory regions:
  .bss (READ | WRITE | RESERVED)
  free memory (READ | WRITE | FREE)
 Initialize global memory allocator...
-Initialize kernel page table...
+Initialize virtual memory management...
 Initialize platform devices...
 Initialize device drivers...
 device model: static

diff --git a/docs/apps_httpclient.md b/docs/apps_httpclient.md
@@ -12,7 +12,7 @@ make A=rust/net/httpclient SMP=1 NET=y LOG=debug run
 ```text
 ...
 [  0.065494 0 axalloc:128] initialize global allocator at: [0xffffffc080286000, 0xffffffc088000000)
-[  0.068109 0 axruntime:115] Initialize kernel page table...
+[  0.068109 0 axruntime:115] Initialize virtual memory management...
 [  0.070549 0 axdriver:59] Initialize device drivers...
 [  0.072131 0 driver_virtio:50] Detected virtio MMIO device with vendor id: 0x554D4551, device type: Network, version: Legacy
 [  0.074003 0 virtio_drivers::device::net:117] Device features CTRL_GUEST_OFFLOADS | MAC | GSO | MRG_RXBUF | STATUS | CTRL_VQ | CTRL_RX | CTRL_VLAN | CTRL_RX_EXTRA | GUEST_ANNOUNCE | CTL_MAC_ADDR | RING_INDIRECT_DESC | RING_EVENT_IDX

diff --git a/docs/apps_sleep.md b/docs/apps_sleep.md
@@ -15,7 +15,7 @@ make A=rust/task/sleep SMP=4 LOG=debug run
 
 [  0.077898 axruntime:109] Initialize global memory allocator...
 [  0.080584 axalloc:128] initialize global allocator at: [0xffffffc08033c000, 0xffffffc088000000)
-[  0.084562 axruntime:115] Initialize kernel page table...
+[  0.084562 axruntime:115] Initialize virtual memory management...
 [  0.088103 axtask:69] Initialize scheduling...
 [  0.090130 axtask::task:113] new task: Task(1, "idle")
 [  0.091833 axalloc:57] expand heap memory: [0xffffffc08034a000, 0xffffffc08035a000)

diff --git a/rust/memtest/expect_trace.out b/rust/memtest/expect_trace.out
@@ -14,16 +14,16 @@ Found physcial memory regions:
 Initialize global memory allocator...
   use TLSF allocator.
 initialize global allocator at: \[0x[0-9a-f]\+, 0x[0-9a-f]\+)
-Initialize kernel page table...
+Initialize virtual memory management...
 Initialize platform devices...
-map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) -> \[PA:0x[0-9a-f]\+, PA:0x[0-9a-f]\+) READ | EXECUTE
-map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) -> \[PA:0x[0-9a-f]\+, PA:0x[0-9a-f]\+) READ
-map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) -> \[PA:0x[0-9a-f]\+, PA:0x[0-9a-f]\+) READ | WRITE
-map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) -> \[PA:0x[0-9a-f]\+, PA:0x[0-9a-f]\+) READ | WRITE
-map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) -> \[PA:0x[0-9a-f]\+, PA:0x[0-9a-f]\+) READ | WRITE
-map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) -> \[PA:0x[0-9a-f]\+, PA:0x[0-9a-f]\+) READ | WRITE
-map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) -> \[PA:0x[0-9a-f]\+, PA:0x[0-9a-f]\+) READ | WRITE | DEVICE
-map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) -> \[PA:0x[0-9a-f]\+, PA:0x[0-9a-f]\+) READ | WRITE
+map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) READ | EXECUTE
+map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) READ
+map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) READ | WRITE
+map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) READ | WRITE
+map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) READ | WRITE
+map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) READ | WRITE
+map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) READ | WRITE | DEVICE
+map_region(PA:0x[0-9a-f]\+): \[VA:0x[0-9a-f]\+, VA:0x[0-9a-f]\+) READ | WRITE
 set page table root: PA:0x[0-9a-f]\+ => PA:0x[0-9a-f]\+
 Primary CPU 0 init OK.
 Running memory tests...

diff --git a/rust/net/httpclient/expect_info.out b/rust/net/httpclient/expect_info.out
@@ -12,7 +12,7 @@ Found physcial memory regions:
  .bss (READ | WRITE | RESERVED)
  free memory (READ | WRITE | FREE)
 Initialize global memory allocator...
-Initialize kernel page table...
+Initialize virtual memory management...
 Initialize platform devices...
 Initialize device drivers...
 registered a new Net device at .\+: "virtio-net"

diff --git a/rust/net/httpclient/expect_info_dns.out b/rust/net/httpclient/expect_info_dns.out
@@ -12,7 +12,7 @@ Found physcial memory regions:
  .bss (READ | WRITE | RESERVED)
  free memory (READ | WRITE | FREE)
 Initialize global memory allocator...
-Initialize kernel page table...
+Initialize virtual memory management...
 Initialize platform devices...
 Initialize device drivers...
 registered a new Net device at .\+: "virtio-net"

diff --git a/scripts/get_deps.sh b/scripts/get_deps.sh
@@ -3,4 +3,6 @@
 AX_ROOT=.arceos
 
 test ! -d "$AX_ROOT" && echo "Cloning repositories ..." || true
-test ! -d "$AX_ROOT" && git clone https://github.com/arceos-org/arceos "$AX_ROOT" || true
+test ! -d "$AX_ROOT" && git clone https://github.com/arceos-org/arceos "$AX_ROOT" --depth=1 || true
+
+$(dirname $0)/set_ax_root.sh $AX_ROOT