TheCloud/thor-os
1
0
Fork 0
mirror of https://github.com/wichtounet/thor-os.git synced 2025-08-04 01:36:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Test invoking long from tsh

Browse Source
This commit is contained in:
Baptiste Wicht 2014-02-03 21:35:56 +01:00
parent 93b763ad86
commit d58c3b8326
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -83,5 +83,11 @@ clean:
cd kernel; $(MAKE) clean cd kernel; $(MAKE) clean
cd programs/one; $(MAKE) clean cd programs/one; $(MAKE) clean
cd programs/hello; $(MAKE) clean cd programs/hello; $(MAKE) clean
cd programs/long;$(MAKE) clean
cd programs/loop; $(MAKE) clean
cd programs/longone; $(MAKE) clean
cd programs/longtwo; $(MAKE) clean
cd programs/keyboard; $(MAKE) clean
cd programs/tsh; $(MAKE) clean
rm -f *.bin rm -f *.bin
rm -f *.flp rm -f *.flp

4
cpp.mk
View File

@ -12,6 +12,6 @@ CPP_FLAGS_32=$(COMMON_CPP_FLAGS) $(CPP_FLAGS_LOW) -mpreferred-stack-boundary=4
CPP_FLAGS_64=$(COMMON_CPP_FLAGS) -mno-sse -mno-sse2 -mno-sse3 -mno-sse4 -mno-sse4.1 -mno-sse4.2 -mno-avx CPP_FLAGS_64=$(COMMON_CPP_FLAGS) -mno-sse -mno-sse2 -mno-sse3 -mno-sse4 -mno-sse4.1 -mno-sse4.2 -mno-avx
COMMON_LINK_FLAGS=-lgcc COMMON_LINK_FLAGS=-lgcc
PROGRAM_LINK_FLAGS=$(COMMON_LINK_FLAGS) -z max-page-size=0x1000 -T ../linker.ld PROGRAM_LINK_FLAGS=$(COMMON_LINK_FLAGS) -mcmodel=small -fPIC -z max-page-size=0x1000 -T ../linker.ld
PROGRAM_FLAGS=-I../../userlib/include/ PROGRAM_FLAGS=-I../../userlib/include/ -mcmodel=small -fPIC

2
kernel/src/scheduler.cpp
View File

@ -21,7 +21,7 @@
#include "physical_allocator.hpp" #include "physical_allocator.hpp"
#include "virtual_allocator.hpp" #include "virtual_allocator.hpp"
constexpr const bool DEBUG_SCHEDULER = false; constexpr const bool DEBUG_SCHEDULER = true;
//Provided by task_switch.s //Provided by task_switch.s
extern "C" { extern "C" {

4
programs/long/src/main.cpp
View File

@ -21,10 +21,14 @@ uint64_t fibonacci_slow(uint64_t s){
int main(){ int main(){
uint64_t i = 0; uint64_t i = 0;
print_line("START");
while(i < 10){ while(i < 10){
print_line(fibonacci_slow(current)); print_line(fibonacci_slow(current));
++i; ++i;
} }
print_line("END");
exit(0); exit(0);
} }

4
programs/tsh/Makefile
View File

@ -5,10 +5,10 @@ default: tsh
include ../../cpp.mk include ../../cpp.mk
%.cpp.o: src/%.cpp %.cpp.o: src/%.cpp
$(CC) $(PROGRAM_FLAGS) -mcmodel=large $(CPP_FLAGS_64) $(WARNING_FLAGS) -c $< -o $@ $(CC) $(PROGRAM_FLAGS) $(CPP_FLAGS_64) $(WARNING_FLAGS) -c $< -o $@
tsh: main.cpp.o tsh: main.cpp.o
$(CC) $(PROGRAM_LINK_FLAGS) -mcmodel=small -fPIC $(CPP_FLAGS_64) -o tsh main.cpp.o $(CC) $(PROGRAM_LINK_FLAGS) $(CPP_FLAGS_64) -o tsh main.cpp.o
clean: clean:
rm -f *.cpp.o rm -f *.cpp.o