# HG changeset patch # User anatofuz # Date 1559896215 -32400 # Node ID 1adde248a61f7a75f7b84cc5d4e67af164b5072c # Parent c05774dbd65ff179dcb779f31444c065bbf6ebf8# Parent ccd59cd9ee450b461ff42678336c5f7d3823f2b0 merge diff -r ccd59cd9ee45 -r 1adde248a61f .hgignore --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgignore Fri Jun 07 17:30:15 2019 +0900 @@ -0,0 +1,5 @@ +syntax: glob + +src/CMakeCache.txt +src/CMakeFiles/ +src/build/ diff -r ccd59cd9ee45 -r 1adde248a61f .hgtags --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgtags Fri Jun 07 17:30:15 2019 +0900 @@ -0,0 +1,1 @@ +87d6dc2cf0019912e6fc660dcaa6db6e00e7d094 no-cbc diff -r ccd59cd9ee45 -r 1adde248a61f CMakeLists.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/CMakeLists.txt Fri Jun 07 17:30:15 2019 +0900 @@ -0,0 +1,12 @@ +cmake_minimum_required(VERSION 3.3) + +# output compile log +set(CMAKE_VERBOSE_MAKEFILE 1) + +# set compiler +set(CMAKE_C_COMPILER $ENV{CBC_COMPILER}) + +# compile option +add_definitions("-Wall -g -O0") + +add_subdirectory(src) diff -r ccd59cd9ee45 -r 1adde248a61f Doc/cvc_xv6.mm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Doc/cvc_xv6.mm Fri Jun 07 17:30:15 2019 +0900 @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ccd59cd9ee45 -r 1adde248a61f Dockerfile diff -r ccd59cd9ee45 -r 1adde248a61f Todo --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Todo Fri Jun 07 17:30:15 2019 +0900 @@ -0,0 +1,11 @@ +Fri Feb 16 16:38:49 JST 2018 + + * xv6arm をつくる Done + * cbclangの-arm Done + * CbC_gcc のarmくろすこんぱいら Done + * cbclang らいぶらりとインクルード Done + * gccbc ライブラリとインクルード Done + * できたxv6をKVMでうごかす Done + 実際にxv6の一部をCbCで書き直す Done + efi boot を書く + diff -r ccd59cd9ee45 -r 1adde248a61f cbclang/arm/setjmp.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cbclang/arm/setjmp.h Fri Jun 07 17:30:15 2019 +0900 @@ -0,0 +1,29 @@ + +typedef int __jmp_buf[64] __attribute__((__aligned__ (8))); +typedef int __sig_atomic_t; +typedef struct + { + unsigned long int __val[(1024 / (8 * sizeof (unsigned long int)))]; + } __sigset_t; +struct __jmp_buf_tag + { + __jmp_buf __jmpbuf; + int __mask_was_saved; + __sigset_t __saved_mask; + }; + +typedef struct __jmp_buf_tag jmp_buf[1]; +extern int setjmp (jmp_buf __env) __attribute__ ((__nothrow__)); + +extern int __sigsetjmp (struct __jmp_buf_tag __env[1], int __savemask) __attribute__ ((__nothrow__)); +extern int _setjmp (struct __jmp_buf_tag __env[1]) __attribute__ ((__nothrow__)); + +extern void longjmp (struct __jmp_buf_tag __env[1], int __val) + __attribute__ ((__nothrow__)) __attribute__ ((__noreturn__)); + +extern void _longjmp (struct __jmp_buf_tag __env[1], int __val) + __attribute__ ((__nothrow__)) __attribute__ ((__noreturn__)); +typedef struct __jmp_buf_tag sigjmp_buf[1]; +extern void siglongjmp (sigjmp_buf __env, int __val) + __attribute__ ((__nothrow__)) __attribute__ ((__noreturn__)); + diff -r ccd59cd9ee45 -r 1adde248a61f edit_xv6arm7 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/edit_xv6arm7 Fri Jun 07 17:30:15 2019 +0900 @@ -0,0 +1,101 @@ + + xv6arm7 + 80ddbab5-a467-4964-8eb1-0475512522ee + 131072 + 131072 + 1 + + hvm + /mnt/dalmore-home/one/src/xv6-rpi/src/kernel.elf + + + + + + + + + Haswell-noTSX + + + + + + + destroy + restart + restart + + + + + + /usr/libexec/qemu-kvm + + + + +
+ + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + +
+ + + + +
+ + + + + + + + + +
+ + + + + + + + +
+ +