Browse Source

Stop using /init filesystem.

Giovanni Mascellani 5 years ago
parent
commit
d117207a81
9 changed files with 6 additions and 6 deletions
  1. 1 1
      Makefile
  2. 1 1
      asmg/main.g
  3. 1 1
      asmg/mescc_hex2.g
  4. 1 1
      asmg/mescc_m1.g
  5. 2 2
      asmg/mescc_m2.g
  6. 0 0
      diskfs/test/test.asm
  7. 0 0
      diskfs/test/test.hex2
  8. 0 0
      diskfs/test/test.m1
  9. 0 0
      diskfs/test/test_mes.c

+ 1 - 1
Makefile

@@ -46,7 +46,7 @@ build/diskfs.img: build/diskfs.list
 build/full-asmg.asm: lib/mb_header.asm lib/kernel.asm lib/no_io.asm lib/shutdown.asm lib/initrd.asm lib/library.asm lib/setjmp.asm lib/pmc.asm asmg/asmg.asm asmg/kernel-asmg.asm lib/top.asm
 	cat $^ | grep -v "^ *section " > $@
 
-build/initrd-asmg.list: asmg/*.g test/test.hex2 test/test.m1 test/test_mes.c test/test.asm
+build/initrd-asmg.list: asmg/*.g
 	ls $^ | sed -e 's|\(.*\)/\([^/]*\)|\2 \1/\2|g' > $@
 
 build/initrd-asmg.diskfs: build/initrd-asmg.list

+ 1 - 1
asmg/main.g

@@ -264,7 +264,7 @@ fun main 0 {
   }
 
   if RUN_ASM {
-    "/init/test.asm" 0 "parse_asm" platform_get_symbol \1 ;
+    "/disk1/test/test.asm" 0 "parse_asm" platform_get_symbol \1 ;
   }
 
   if RUN_FASM {

+ 1 - 1
asmg/mescc_hex2.g

@@ -326,7 +326,7 @@ fun hex2_link 1 {
 fun hex2_test 0 {
   $files
   @files 4 vector_init = ;
-  files "/init/test.hex2" strdup vector_push_back ;
+  files "/disk1/test/test.hex2" strdup vector_push_back ;
   files hex2_link free ;
   files free_vect_of_ptrs ;
 }

+ 1 - 1
asmg/mescc_m1.g

@@ -623,7 +623,7 @@ fun m1_assemble 2 {
 fun m1_test 0 {
   $files
   @files 4 vector_init = ;
-  files "/init/test.m1" strdup vector_push_back ;
+  files "/disk1/test/test.m1" strdup vector_push_back ;
   files "/ram/assembled" m1_assemble ;
   files free_vect_of_ptrs ;
 }

+ 2 - 2
asmg/mescc_m2.g

@@ -2151,7 +2151,7 @@ fun m2_compile 2 {
 fun m2_test 0 {
   $files
   @files 4 vector_init = ;
-  files "/init/test_mes.c" strdup vector_push_back ;
+  files "/disk1/test/test_mes.c" strdup vector_push_back ;
   files "/ram/compiled.m1" m2_compile ;
   files free_vect_of_ptrs ;
 
@@ -2161,7 +2161,7 @@ fun m2_test 0 {
 fun m2_test_full_compilation 0 {
   $files
   @files 4 vector_init = ;
-  files "/init/test_mes.c" strdup vector_push_back ;
+  files "/disk1/test/test_mes.c" strdup vector_push_back ;
   files "/ram/compiled.m1" m2_compile ;
   files free_vect_of_ptrs ;
   #"/ram/compiled.m1" dump_file ;

+ 0 - 0
test/test.asm → diskfs/test/test.asm


+ 0 - 0
test/test.hex2 → diskfs/test/test.hex2


+ 0 - 0
test/test.m1 → diskfs/test/test.m1


+ 0 - 0
test/test_mes.c → diskfs/test/test_mes.c