darkkirb/old-trainOS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refactorings depending on Electronics.

Browse source
This commit is contained in:
Felix Queißner 2015-10-18 23:24:42 +02:00
parent bb7e42970e
commit 3c6740cde0
3 changed files with 309 additions and 205 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Makefile
View file

@ -8,7 +8,6 @@ CXX = g++
LD = g++
LEX = flex
YACC = bison
TEMPLE = mono temple.exe
# File Lists
SRCS_AS = asm/dynamic.S asm/intr_common_handler.S asm/multiboot.S asm/start.S
@ -30,80 +29,80 @@ all: kernel
clean:
$(RM) obj/dynamic.o obj/intr_common_handler.o obj/multiboot.o obj/start.o obj/console.o obj/init.o obj/interrupts.o obj/malloc.o obj/pmm.o obj/serial.o obj/stdlib.o obj/timer.o obj/vmm.o obj/cplusplus.o obj/vm.o obj/cpustatetype.o obj/io.o
kernel: obj/dynamic.o obj/intr_common_handler.o obj/multiboot.o obj/start.o obj/console.o obj/init.o obj/interrupts.o obj/malloc.o obj/pmm.o obj/serial.o obj/stdlib.o obj/timer.o obj/vmm.o obj/cplusplus.o obj/vm.o obj/cpustatetype.o obj/io.o conductance/assembly.o conductance/casts.o conductance/compoundtype.o conductance/instructions.o conductance/process.o conductance/string.o conductance/thread.o conductance/virtualmachine.o conductance/vmpointertype.o conductance/vmprimitivetype.o conductance/vmprocessidtype.o conductance/vmtype.o conductance/vmvalue.o conductance/vmvoidtype.o obj/main.in obj/keyboard.in
$(LD) $(FLAGS) $(LDFLAGS) -o $@ obj/dynamic.o obj/intr_common_handler.o obj/multiboot.o obj/start.o obj/console.o obj/init.o obj/interrupts.o obj/malloc.o obj/pmm.o obj/serial.o obj/stdlib.o obj/timer.o obj/vmm.o obj/cplusplus.o obj/vm.o obj/cpustatetype.o obj/io.o conductance/assembly.o conductance/casts.o conductance/compoundtype.o conductance/instructions.o conductance/process.o conductance/string.o conductance/thread.o conductance/virtualmachine.o conductance/vmpointertype.o conductance/vmprimitivetype.o conductance/vmprocessidtype.o conductance/vmtype.o conductance/vmvalue.o conductance/vmvoidtype.o
kernel: obj/dynamic.o obj/intr_common_handler.o obj/multiboot.o obj/start.o obj/console.o obj/init.o obj/interrupts.o obj/malloc.o obj/pmm.o obj/serial.o obj/stdlib.o obj/timer.o obj/vmm.o obj/cplusplus.o obj/vm.o obj/cpustatetype.o obj/io.o conductance/assembly.o conductance/casts.o conductance/compoundtype.o conductance/instructions.o conductance/module.o conductance/object.o conductance/opcodes.o conductance/process.o conductance/string.o conductance/thread.o conductance/virtualmachine.o conductance/vmpointertype.o conductance/vmprimitivetype.o conductance/vmprocessidtype.o conductance/vmtype.o conductance/vmvalue.o conductance/vmvoidtype.o
$(LD) $(FLAGS) $(LDFLAGS) -o $@ obj/dynamic.o obj/intr_common_handler.o obj/multiboot.o obj/start.o obj/console.o obj/init.o obj/interrupts.o obj/malloc.o obj/pmm.o obj/serial.o obj/stdlib.o obj/timer.o obj/vmm.o obj/cplusplus.o obj/vm.o obj/cpustatetype.o obj/io.o conductance/assembly.o conductance/casts.o conductance/compoundtype.o conductance/instructions.o conductance/module.o conductance/object.o conductance/opcodes.o conductance/process.o conductance/string.o conductance/thread.o conductance/virtualmachine.o conductance/vmpointertype.o conductance/vmprimitivetype.o conductance/vmprocessidtype.o conductance/vmtype.o conductance/vmvalue.o conductance/vmvoidtype.o
# src/console.c
obj/console.o: src/console.c include/console.h include/kstdlib.h \
include/varargs.h include/config.h include/malloc.h
$(CC) -iquoteobj $(FLAGS) $(CCFLAGS) -o $@ -c src/console.c
$(CC) $(FLAGS) $(CCFLAGS) -o $@ -c src/console.c
# src/init.c
obj/init.o: src/init.c include/kernel.h include/kstdlib.h include/varargs.h \
include/config.h include/malloc.h include/console.h include/interrupts.h \
include/cpustate.h include/pmm.h include/multiboot.h include/vmm.h \
include/timer.h include/serial.h
$(CC) -iquoteobj $(FLAGS) $(CCFLAGS) -o $@ -c src/init.c
$(CC) $(FLAGS) $(CCFLAGS) -o $@ -c src/init.c
# src/interrupts.c
obj/interrupts.o: src/interrupts.c include/interrupts.h include/cpustate.h \
include/console.h include/kstdlib.h include/varargs.h include/config.h \
include/malloc.h include/io.h src/intr_stubs.h
$(CC) -iquoteobj $(FLAGS) $(CCFLAGS) -o $@ -c src/interrupts.c
$(CC) $(FLAGS) $(CCFLAGS) -o $@ -c src/interrupts.c
# src/malloc.c
obj/malloc.o: src/malloc.c include/config.h include/kernel.h \
include/kstdlib.h include/varargs.h include/malloc.h include/console.h \
include/serial.h
$(CC) -iquoteobj $(FLAGS) $(CCFLAGS) -o $@ -c src/malloc.c
$(CC) $(FLAGS) $(CCFLAGS) -o $@ -c src/malloc.c
# src/pmm.c
obj/pmm.o: src/pmm.c include/pmm.h include/multiboot.h include/kernel.h \
include/kstdlib.h include/varargs.h include/config.h include/malloc.h \
include/console.h
$(CC) -iquoteobj $(FLAGS) $(CCFLAGS) -o $@ -c src/pmm.c
$(CC) $(FLAGS) $(CCFLAGS) -o $@ -c src/pmm.c
# src/serial.c
obj/serial.o: src/serial.c include/io.h include/serial.h include/kstdlib.h \
include/varargs.h include/config.h include/malloc.h
$(CC) -iquoteobj $(FLAGS) $(CCFLAGS) -o $@ -c src/serial.c
$(CC) $(FLAGS) $(CCFLAGS) -o $@ -c src/serial.c
# src/stdlib.c
obj/stdlib.o: src/stdlib.c include/kstdlib.h include/varargs.h \
include/config.h include/malloc.h include/kernel.h
$(CC) -iquoteobj $(FLAGS) $(CCFLAGS) -o $@ -c src/stdlib.c
$(CC) $(FLAGS) $(CCFLAGS) -o $@ -c src/stdlib.c
# src/timer.c
obj/timer.o: src/timer.c include/timer.h include/kernel.h \
include/interrupts.h include/cpustate.h
$(CC) -iquoteobj $(FLAGS) $(CCFLAGS) -o $@ -c src/timer.c
$(CC) $(FLAGS) $(CCFLAGS) -o $@ -c src/timer.c
# src/vmm.c
obj/vmm.o: src/vmm.c include/config.h include/vmm.h include/pmm.h \
include/multiboot.h include/kstdlib.h include/varargs.h include/malloc.h \
include/console.h include/kernel.h
$(CC) -iquoteobj $(FLAGS) $(CCFLAGS) -o $@ -c src/vmm.c
$(CC) $(FLAGS) $(CCFLAGS) -o $@ -c src/vmm.c
# src/cplusplus.cpp
obj/cplusplus.o: src/cplusplus.cpp include/kstdlib.h include/varargs.h \
include/config.h include/malloc.h include/console.h include/ker/new.hpp
$(CXX) -iquoteobj $(FLAGS) $(CXXFLAGS) -o $@ -c src/cplusplus.cpp
$(CXX) $(FLAGS) $(CXXFLAGS) -o $@ -c src/cplusplus.cpp
# src/vm.cpp
obj/vm.o: src/vm.cpp include/kstdlib.h include/varargs.h include/config.h \
include/malloc.h include/timer.h include/dynamic.h include/console.h \
include/multiboot.h include/interrupts.h include/cpustate.h \
src/../csl/cpustatetype.hpp src/../csl/io.hpp
$(CXX) -iquoteobj $(FLAGS) $(CXXFLAGS) -o $@ -c src/vm.cpp
$(CXX) $(FLAGS) $(CXXFLAGS) -o $@ -c src/vm.cpp
# csl/cpustatetype.cpp
obj/cpustatetype.o: csl/cpustatetype.cpp csl/cpustatetype.hpp \
include/cpustate.h include/console.h
$(CXX) -iquoteobj $(FLAGS) $(CXXFLAGS) -o $@ -c csl/cpustatetype.cpp
$(CXX) $(FLAGS) $(CXXFLAGS) -o $@ -c csl/cpustatetype.cpp
# csl/io.cpp
obj/io.o: csl/io.cpp include/io.h csl/io.hpp
$(CXX) -iquoteobj $(FLAGS) $(CXXFLAGS) -o $@ -c csl/io.cpp
$(CXX) $(FLAGS) $(CXXFLAGS) -o $@ -c csl/io.cpp
# asm/dynamic.S
obj/dynamic.o: asm/dynamic.S

463
conductance/Makefile
View file

@ -15,7 +15,7 @@ CXX = g++
DEFINES = -DCIRCUIT_OS
CFLAGS = -pipe -m32 -g -fPIC -Wall -W $(DEFINES)
CXXFLAGS = -pipe -g -Wall -Wextra -fno-stack-protector -fno-use-cxa-atexit -nostdlib -fno-builtin -fno-rtti -fno-exceptions -ffreestanding -m32 -fno-leading-underscore -g -fPIC -std=c++0x -Wall -W $(DEFINES)
INCPATH = -I../../Electronics/Electronics/Conductance -I. -I../../Electronics/Electronics/Tools -I/home/felix/projects/trainOS/include -I/usr/lib/qt/mkspecs/linux-g++
INCPATH = -I../../Electronics/Electronics/Conductance -I. -I../../Electronics/Electronics/Tools -I../include -I/usr/lib/qt/mkspecs/linux-g++
QMAKE = /usr/lib/qt/bin/qmake
DEL_FILE = rm -f
CHK_DIR_EXISTS= test -d
@ -33,7 +33,7 @@ MOVE = mv -f
TAR = tar -cf
COMPRESS = gzip -9f
DISTNAME = Conductance1.0.0
DISTDIR = /data/projects/trainOS/conductance/.tmp/Conductance1.0.0
DISTDIR = /home/felix/projects/trainOS/conductance/.tmp/Conductance1.0.0
AR = ar cqs
RANLIB =
SED = sed
@ -58,7 +58,9 @@ SOURCES = ../../Electronics/Electronics/Conductance/types/compoundtype.cpp
../../Electronics/Electronics/Conductance/process.cpp \
../../Electronics/Electronics/Conductance/instructions.cpp \
../../Electronics/Electronics/Conductance/types/vmprocessidtype.cpp \
../../Electronics/Electronics/Conductance/csl/casts.cpp
../../Electronics/Electronics/Conductance/csl/casts.cpp \
../../Electronics/Electronics/Conductance/object.cpp \
../../Electronics/Electronics/Conductance/module.cpp
OBJECTS = compoundtype.o \
vmpointertype.o \
vmprimitivetype.o \
@ -72,7 +74,9 @@ OBJECTS = compoundtype.o \
process.o \
instructions.o \
vmprocessidtype.o \
casts.o
casts.o \
object.o \
module.o
DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \
/usr/lib/qt/mkspecs/common/unix.conf \
/usr/lib/qt/mkspecs/common/linux.conf \
@ -83,6 +87,7 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \
/usr/lib/qt/mkspecs/common/g++-unix.conf \
/usr/lib/qt/mkspecs/qconfig.pri \
/usr/lib/qt/mkspecs/modules/qt_Attica.pri \
/usr/lib/qt/mkspecs/modules/qt_BluezQt.pri \
/usr/lib/qt/mkspecs/modules/qt_KActivities.pri \
/usr/lib/qt/mkspecs/modules/qt_KArchive.pri \
/usr/lib/qt/mkspecs/modules/qt_KAuth.pri \
@ -118,6 +123,8 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \
/usr/lib/qt/mkspecs/modules/qt_KWidgetsAddons.pri \
/usr/lib/qt/mkspecs/modules/qt_KWindowSystem.pri \
/usr/lib/qt/mkspecs/modules/qt_KXmlGui.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_bluetooth.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_bluetooth_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_clucene_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_concurrent.pri \
@ -140,8 +147,14 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \
/usr/lib/qt/mkspecs/modules/qt_lib_help_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_location.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_location_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_multimedia.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_multimedia_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_multimediawidgets.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_multimediawidgets_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_network.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_network_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_nfc.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_nfc_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_opengl.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_opengl_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_openglextensions.pri \
@ -156,6 +169,7 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \
/usr/lib/qt/mkspecs/modules/qt_lib_qmldevtools_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_qmltest.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_qmltest_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_quick.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_quick_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_quickparticles_private.pri \
@ -178,8 +192,16 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \
/usr/lib/qt/mkspecs/modules/qt_lib_uiplugin.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_uitools.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_uitools_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_waylandclient.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_waylandclient_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_webchannel.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_webchannel_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_webengine.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_webengine_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_webenginecore.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_webenginecore_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_webenginewidgets.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_webenginewidgets_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_webkit.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_webkit_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_webkitwidgets.pri \
@ -221,7 +243,6 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \
types/vmprimitivetype.hpp \
types/vmvoidtype.hpp \
opcodes.hpp \
virtualmachine.hpp \
vmtype.hpp \
vmtypes.hpp \
vmvalue.hpp \
@ -231,7 +252,9 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \
../Tools/fixedstring.hpp \
../Tools/refcounted.hpp \
types/vmprocessidtype.hpp \
csl/casts.hpp ../../Electronics/Electronics/Conductance/types/compoundtype.cpp \
csl/casts.hpp \
vmstuff.hpp \
virtualmachine.hpp ../../Electronics/Electronics/Conductance/types/compoundtype.cpp \
../../Electronics/Electronics/Conductance/types/vmpointertype.cpp \
../../Electronics/Electronics/Conductance/types/vmprimitivetype.cpp \
../../Electronics/Electronics/Conductance/types/vmvoidtype.cpp \
@ -244,7 +267,9 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \
../../Electronics/Electronics/Conductance/process.cpp \
../../Electronics/Electronics/Conductance/instructions.cpp \
../../Electronics/Electronics/Conductance/types/vmprocessidtype.cpp \
../../Electronics/Electronics/Conductance/csl/casts.cpp
../../Electronics/Electronics/Conductance/csl/casts.cpp \
../../Electronics/Electronics/Conductance/object.cpp \
../../Electronics/Electronics/Conductance/module.cpp
QMAKE_TARGET = Conductance
DESTDIR = #avoid trailing-slash linebreak
TARGET = libConductance.a
@ -289,6 +314,7 @@ Makefile: ../../Electronics/Electronics/Conductance/Conductance.pro /usr/lib/qt/
/usr/lib/qt/mkspecs/common/g++-unix.conf \
/usr/lib/qt/mkspecs/qconfig.pri \
/usr/lib/qt/mkspecs/modules/qt_Attica.pri \
/usr/lib/qt/mkspecs/modules/qt_BluezQt.pri \
/usr/lib/qt/mkspecs/modules/qt_KActivities.pri \
/usr/lib/qt/mkspecs/modules/qt_KArchive.pri \
/usr/lib/qt/mkspecs/modules/qt_KAuth.pri \
@ -324,6 +350,8 @@ Makefile: ../../Electronics/Electronics/Conductance/Conductance.pro /usr/lib/qt/
/usr/lib/qt/mkspecs/modules/qt_KWidgetsAddons.pri \
/usr/lib/qt/mkspecs/modules/qt_KWindowSystem.pri \
/usr/lib/qt/mkspecs/modules/qt_KXmlGui.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_bluetooth.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_bluetooth_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_clucene_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_concurrent.pri \
@ -346,8 +374,14 @@ Makefile: ../../Electronics/Electronics/Conductance/Conductance.pro /usr/lib/qt/
/usr/lib/qt/mkspecs/modules/qt_lib_help_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_location.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_location_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_multimedia.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_multimedia_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_multimediawidgets.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_multimediawidgets_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_network.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_network_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_nfc.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_nfc_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_opengl.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_opengl_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_openglextensions.pri \
@ -362,6 +396,7 @@ Makefile: ../../Electronics/Electronics/Conductance/Conductance.pro /usr/lib/qt/
/usr/lib/qt/mkspecs/modules/qt_lib_qmldevtools_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_qmltest.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_qmltest_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_quick.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_quick_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_quickparticles_private.pri \
@ -384,8 +419,16 @@ Makefile: ../../Electronics/Electronics/Conductance/Conductance.pro /usr/lib/qt/
/usr/lib/qt/mkspecs/modules/qt_lib_uiplugin.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_uitools.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_uitools_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_waylandclient.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_waylandclient_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_webchannel.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_webchannel_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_webengine.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_webengine_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_webenginecore.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_webenginecore_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_webenginewidgets.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_webenginewidgets_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_webkit.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_webkit_private.pri \
/usr/lib/qt/mkspecs/modules/qt_lib_webkitwidgets.pri \
@ -434,6 +477,7 @@ Makefile: ../../Electronics/Electronics/Conductance/Conductance.pro /usr/lib/qt/
/usr/lib/qt/mkspecs/common/g++-unix.conf:
/usr/lib/qt/mkspecs/qconfig.pri:
/usr/lib/qt/mkspecs/modules/qt_Attica.pri:
/usr/lib/qt/mkspecs/modules/qt_BluezQt.pri:
/usr/lib/qt/mkspecs/modules/qt_KActivities.pri:
/usr/lib/qt/mkspecs/modules/qt_KArchive.pri:
/usr/lib/qt/mkspecs/modules/qt_KAuth.pri:
@ -469,6 +513,8 @@ Makefile: ../../Electronics/Electronics/Conductance/Conductance.pro /usr/lib/qt/
/usr/lib/qt/mkspecs/modules/qt_KWidgetsAddons.pri:
/usr/lib/qt/mkspecs/modules/qt_KWindowSystem.pri:
/usr/lib/qt/mkspecs/modules/qt_KXmlGui.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_bluetooth.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_bluetooth_private.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_clucene_private.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_concurrent.pri:
@ -491,8 +537,14 @@ Makefile: ../../Electronics/Electronics/Conductance/Conductance.pro /usr/lib/qt/
/usr/lib/qt/mkspecs/modules/qt_lib_help_private.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_location.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_location_private.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_multimedia.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_multimedia_private.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_multimediawidgets.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_multimediawidgets_private.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_network.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_network_private.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_nfc.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_nfc_private.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_opengl.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_opengl_private.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_openglextensions.pri:
@ -507,6 +559,7 @@ Makefile: ../../Electronics/Electronics/Conductance/Conductance.pro /usr/lib/qt/
/usr/lib/qt/mkspecs/modules/qt_lib_qmldevtools_private.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_qmltest.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_qmltest_private.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_quick.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_quick_private.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_quickparticles_private.pri:
@ -529,8 +582,16 @@ Makefile: ../../Electronics/Electronics/Conductance/Conductance.pro /usr/lib/qt/
/usr/lib/qt/mkspecs/modules/qt_lib_uiplugin.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_uitools.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_uitools_private.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_waylandclient.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_waylandclient_private.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_webchannel.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_webchannel_private.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_webengine.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_webengine_private.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_webenginecore.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_webenginecore_private.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_webenginewidgets.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_webenginewidgets_private.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_webkit.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_webkit_private.pri:
/usr/lib/qt/mkspecs/modules/qt_lib_webkitwidgets.pri:
@ -609,119 +670,119 @@ compiler_clean:
####### Compile
compoundtype.o: ../../Electronics/Electronics/Conductance/types/compoundtype.cpp ../../Electronics/Electronics/Conductance/types/compoundtype.hpp \
/home/felix/projects/trainOS/include/ker/dictionary.hpp \
/home/felix/projects/trainOS/include/kernel.h \
/home/felix/projects/trainOS/include/ker/pair.hpp \
/home/felix/projects/trainOS/include/ker/vector.hpp \
/home/felix/projects/trainOS/include/kstdlib.h \
/home/felix/projects/trainOS/include/varargs.h \
/home/felix/projects/trainOS/include/config.h \
/home/felix/projects/trainOS/include/malloc.h \
/home/felix/projects/trainOS/include/ker/new.hpp \
../include/ker/dictionary.hpp \
../include/kernel.h \
../include/ker/pair.hpp \
../include/ker/vector.hpp \
../include/kstdlib.h \
../include/varargs.h \
../include/config.h \
../include/malloc.h \
../include/ker/new.hpp \
../../Electronics/Electronics/Conductance/vmtype.hpp \
../../Electronics/Electronics/Conductance/vmtypes.hpp \
/home/felix/projects/trainOS/include/ker/string.hpp \
/home/felix/projects/trainOS/include/ker/config.hpp \
../include/ker/string.hpp \
../include/ker/config.hpp \
../../Electronics/Electronics/Conductance/vmvalue.hpp \
../../Electronics/Electronics/Conductance/opcodes.hpp \
../../Electronics/Electronics/Tools/fixedstring.hpp
../include/ker/fixedstring.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o compoundtype.o ../../Electronics/Electronics/Conductance/types/compoundtype.cpp
vmpointertype.o: ../../Electronics/Electronics/Conductance/types/vmpointertype.cpp ../../Electronics/Electronics/Conductance/types/vmpointertype.hpp \
../../Electronics/Electronics/Conductance/vmtype.hpp \
../../Electronics/Electronics/Conductance/vmtypes.hpp \
/home/felix/projects/trainOS/include/ker/string.hpp \
/home/felix/projects/trainOS/include/kstdlib.h \
/home/felix/projects/trainOS/include/varargs.h \
/home/felix/projects/trainOS/include/config.h \
/home/felix/projects/trainOS/include/malloc.h \
/home/felix/projects/trainOS/include/ker/config.hpp \
/home/felix/projects/trainOS/include/ker/vector.hpp \
/home/felix/projects/trainOS/include/ker/new.hpp \
../include/ker/string.hpp \
../include/kstdlib.h \
../include/varargs.h \
../include/config.h \
../include/malloc.h \
../include/ker/config.hpp \
../include/ker/vector.hpp \
../include/ker/new.hpp \
../../Electronics/Electronics/Conductance/vmvalue.hpp \
../../Electronics/Electronics/Conductance/opcodes.hpp \
/home/felix/projects/trainOS/include/ker/dictionary.hpp \
/home/felix/projects/trainOS/include/kernel.h \
/home/felix/projects/trainOS/include/ker/pair.hpp \
../../Electronics/Electronics/Tools/fixedstring.hpp
../include/ker/dictionary.hpp \
../include/kernel.h \
../include/ker/pair.hpp \
../include/ker/fixedstring.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o vmpointertype.o ../../Electronics/Electronics/Conductance/types/vmpointertype.cpp
vmprimitivetype.o: ../../Electronics/Electronics/Conductance/types/vmprimitivetype.cpp ../../Electronics/Electronics/Conductance/types/vmprimitivetype.hpp \
/home/felix/projects/trainOS/include/ker/string.hpp \
/home/felix/projects/trainOS/include/kstdlib.h \
/home/felix/projects/trainOS/include/varargs.h \
/home/felix/projects/trainOS/include/config.h \
/home/felix/projects/trainOS/include/malloc.h \
/home/felix/projects/trainOS/include/ker/config.hpp \
../include/ker/string.hpp \
../include/kstdlib.h \
../include/varargs.h \
../include/config.h \
../include/malloc.h \
../include/ker/config.hpp \
../../Electronics/Electronics/Conductance/vmtype.hpp \
../../Electronics/Electronics/Conductance/vmtypes.hpp \
/home/felix/projects/trainOS/include/ker/vector.hpp \
/home/felix/projects/trainOS/include/ker/new.hpp \
../include/ker/vector.hpp \
../include/ker/new.hpp \
../../Electronics/Electronics/Conductance/vmvalue.hpp \
../../Electronics/Electronics/Conductance/opcodes.hpp \
/home/felix/projects/trainOS/include/ker/dictionary.hpp \
/home/felix/projects/trainOS/include/kernel.h \
/home/felix/projects/trainOS/include/ker/pair.hpp \
../../Electronics/Electronics/Tools/fixedstring.hpp
../include/ker/dictionary.hpp \
../include/kernel.h \
../include/ker/pair.hpp \
../include/ker/fixedstring.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o vmprimitivetype.o ../../Electronics/Electronics/Conductance/types/vmprimitivetype.cpp
vmvoidtype.o: ../../Electronics/Electronics/Conductance/types/vmvoidtype.cpp ../../Electronics/Electronics/Conductance/types/vmvoidtype.hpp \
../../Electronics/Electronics/Conductance/vmtype.hpp \
../../Electronics/Electronics/Conductance/vmtypes.hpp \
/home/felix/projects/trainOS/include/ker/string.hpp \
/home/felix/projects/trainOS/include/kstdlib.h \
/home/felix/projects/trainOS/include/varargs.h \
/home/felix/projects/trainOS/include/config.h \
/home/felix/projects/trainOS/include/malloc.h \
/home/felix/projects/trainOS/include/ker/config.hpp \
/home/felix/projects/trainOS/include/ker/vector.hpp \
/home/felix/projects/trainOS/include/ker/new.hpp \
../include/ker/string.hpp \
../include/kstdlib.h \
../include/varargs.h \
../include/config.h \
../include/malloc.h \
../include/ker/config.hpp \
../include/ker/vector.hpp \
../include/ker/new.hpp \
../../Electronics/Electronics/Conductance/vmvalue.hpp \
../../Electronics/Electronics/Conductance/opcodes.hpp \
/home/felix/projects/trainOS/include/ker/dictionary.hpp \
/home/felix/projects/trainOS/include/kernel.h \
/home/felix/projects/trainOS/include/ker/pair.hpp \
../../Electronics/Electronics/Tools/fixedstring.hpp
../include/ker/dictionary.hpp \
../include/kernel.h \
../include/ker/pair.hpp \
../include/ker/fixedstring.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o vmvoidtype.o ../../Electronics/Electronics/Conductance/types/vmvoidtype.cpp
assembly.o: ../../Electronics/Electronics/Conductance/assembly.cpp ../../Electronics/Electronics/Conductance/assembly.hpp \
/home/felix/projects/trainOS/include/ker/dictionary.hpp \
/home/felix/projects/trainOS/include/kernel.h \
/home/felix/projects/trainOS/include/ker/pair.hpp \
/home/felix/projects/trainOS/include/ker/vector.hpp \
/home/felix/projects/trainOS/include/kstdlib.h \
/home/felix/projects/trainOS/include/varargs.h \
/home/felix/projects/trainOS/include/config.h \
/home/felix/projects/trainOS/include/malloc.h \
/home/felix/projects/trainOS/include/ker/new.hpp \
/home/felix/projects/trainOS/include/ker/string.hpp \
/home/felix/projects/trainOS/include/ker/config.hpp \
../include/ker/dictionary.hpp \
../include/kernel.h \
../include/ker/pair.hpp \
../include/ker/vector.hpp \
../include/kstdlib.h \
../include/varargs.h \
../include/config.h \
../include/malloc.h \
../include/ker/new.hpp \
../include/ker/string.hpp \
../include/ker/config.hpp \
../../Electronics/Electronics/Conductance/vmtypes.hpp \
../../Electronics/Electronics/Tools/refcounted.hpp \
../../Electronics/Electronics/Tools/fixedstring.hpp \
../../Electronics/Electronics/Tools/binarywriter.hpp \
../../Electronics/Electronics/Tools/binaryreader.hpp
../include/ker/referencecounted.hpp \
../include/ker/fixedstring.hpp \
../include/ker/binarywriter.hpp \
../include/ker/binaryreader.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o assembly.o ../../Electronics/Electronics/Conductance/assembly.cpp
virtualmachine.o: ../../Electronics/Electronics/Conductance/virtualmachine.cpp /home/felix/projects/trainOS/include/kstdlib.h \
/home/felix/projects/trainOS/include/varargs.h \
/home/felix/projects/trainOS/include/config.h \
/home/felix/projects/trainOS/include/malloc.h \
virtualmachine.o: ../../Electronics/Electronics/Conductance/virtualmachine.cpp ../include/kstdlib.h \
../include/varargs.h \
../include/config.h \
../include/malloc.h \
../../Electronics/Electronics/Conductance/vmtype.hpp \
../../Electronics/Electronics/Conductance/vmtypes.hpp \
/home/felix/projects/trainOS/include/ker/string.hpp \
/home/felix/projects/trainOS/include/ker/config.hpp \
/home/felix/projects/trainOS/include/ker/vector.hpp \
/home/felix/projects/trainOS/include/ker/new.hpp \
../include/ker/string.hpp \
../include/ker/config.hpp \
../include/ker/vector.hpp \
../include/ker/new.hpp \
../../Electronics/Electronics/Conductance/vmvalue.hpp \
../../Electronics/Electronics/Conductance/opcodes.hpp \
/home/felix/projects/trainOS/include/ker/dictionary.hpp \
/home/felix/projects/trainOS/include/kernel.h \
/home/felix/projects/trainOS/include/ker/pair.hpp \
../../Electronics/Electronics/Tools/fixedstring.hpp \
../include/ker/dictionary.hpp \
../include/kernel.h \
../include/ker/pair.hpp \
../include/ker/fixedstring.hpp \
../../Electronics/Electronics/Conductance/virtualmachine.hpp \
../../Electronics/Electronics/Tools/binaryreader.hpp \
../../Electronics/Electronics/Tools/refcounted.hpp \
../include/ker/referencecounted.hpp \
../include/ker/binaryreader.hpp \
../../Electronics/Electronics/Conductance/assembly.hpp \
../../Electronics/Electronics/Conductance/types/compoundtype.hpp \
../../Electronics/Electronics/Conductance/types/vmprocessidtype.hpp \
@ -731,20 +792,20 @@ virtualmachine.o: ../../Electronics/Electronics/Conductance/virtualmachine.cpp /
vmtype.o: ../../Electronics/Electronics/Conductance/vmtype.cpp ../../Electronics/Electronics/Conductance/vmtype.hpp \
../../Electronics/Electronics/Conductance/vmtypes.hpp \
/home/felix/projects/trainOS/include/ker/string.hpp \
/home/felix/projects/trainOS/include/kstdlib.h \
/home/felix/projects/trainOS/include/varargs.h \
/home/felix/projects/trainOS/include/config.h \
/home/felix/projects/trainOS/include/malloc.h \
/home/felix/projects/trainOS/include/ker/config.hpp \
/home/felix/projects/trainOS/include/ker/vector.hpp \
/home/felix/projects/trainOS/include/ker/new.hpp \
../include/ker/string.hpp \
../include/kstdlib.h \
../include/varargs.h \
../include/config.h \
../include/malloc.h \
../include/ker/config.hpp \
../include/ker/vector.hpp \
../include/ker/new.hpp \
../../Electronics/Electronics/Conductance/vmvalue.hpp \
../../Electronics/Electronics/Conductance/opcodes.hpp \
/home/felix/projects/trainOS/include/ker/dictionary.hpp \
/home/felix/projects/trainOS/include/kernel.h \
/home/felix/projects/trainOS/include/ker/pair.hpp \
../../Electronics/Electronics/Tools/fixedstring.hpp \
../include/ker/dictionary.hpp \
../include/kernel.h \
../include/ker/pair.hpp \
../include/ker/fixedstring.hpp \
../../Electronics/Electronics/Conductance/types/vmvoidtype.hpp \
../../Electronics/Electronics/Conductance/types/vmprimitivetype.hpp \
../../Electronics/Electronics/Conductance/types/vmprocessidtype.hpp
@ -752,138 +813,182 @@ vmtype.o: ../../Electronics/Electronics/Conductance/vmtype.cpp ../../Electronics
vmvalue.o: ../../Electronics/Electronics/Conductance/vmvalue.cpp ../../Electronics/Electronics/Conductance/vmvalue.hpp \
../../Electronics/Electronics/Conductance/vmtypes.hpp \
/home/felix/projects/trainOS/include/ker/string.hpp \
/home/felix/projects/trainOS/include/kstdlib.h \
/home/felix/projects/trainOS/include/varargs.h \
/home/felix/projects/trainOS/include/config.h \
/home/felix/projects/trainOS/include/malloc.h \
/home/felix/projects/trainOS/include/ker/config.hpp \
/home/felix/projects/trainOS/include/ker/vector.hpp \
/home/felix/projects/trainOS/include/ker/new.hpp \
../include/ker/string.hpp \
../include/kstdlib.h \
../include/varargs.h \
../include/config.h \
../include/malloc.h \
../include/ker/config.hpp \
../include/ker/vector.hpp \
../include/ker/new.hpp \
../../Electronics/Electronics/Conductance/vmtype.hpp \
../../Electronics/Electronics/Conductance/opcodes.hpp \
/home/felix/projects/trainOS/include/ker/dictionary.hpp \
/home/felix/projects/trainOS/include/kernel.h \
/home/felix/projects/trainOS/include/ker/pair.hpp \
../../Electronics/Electronics/Tools/fixedstring.hpp
../include/ker/dictionary.hpp \
../include/kernel.h \
../include/ker/pair.hpp \
../include/ker/fixedstring.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o vmvalue.o ../../Electronics/Electronics/Conductance/vmvalue.cpp
string.o: ../ker/string.cpp ../include/ker/string.hpp \
/home/felix/projects/trainOS/include/kstdlib.h \
/home/felix/projects/trainOS/include/varargs.h \
/home/felix/projects/trainOS/include/config.h \
/home/felix/projects/trainOS/include/malloc.h \
/home/felix/projects/trainOS/include/ker/config.hpp
../include/kstdlib.h \
../include/varargs.h \
../include/config.h \
../include/malloc.h \
../include/ker/config.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o string.o ../ker/string.cpp
thread.o: ../../Electronics/Electronics/Conductance/thread.cpp /home/felix/projects/trainOS/include/kstdlib.h \
/home/felix/projects/trainOS/include/varargs.h \
/home/felix/projects/trainOS/include/config.h \
/home/felix/projects/trainOS/include/malloc.h \
thread.o: ../../Electronics/Electronics/Conductance/thread.cpp ../include/kstdlib.h \
../include/varargs.h \
../include/config.h \
../include/malloc.h \
../../Electronics/Electronics/Conductance/vmtype.hpp \
../../Electronics/Electronics/Conductance/vmtypes.hpp \
/home/felix/projects/trainOS/include/ker/string.hpp \
/home/felix/projects/trainOS/include/ker/config.hpp \
/home/felix/projects/trainOS/include/ker/vector.hpp \
/home/felix/projects/trainOS/include/ker/new.hpp \
../include/ker/string.hpp \
../include/ker/config.hpp \
../include/ker/vector.hpp \
../include/ker/new.hpp \
../../Electronics/Electronics/Conductance/vmvalue.hpp \
../../Electronics/Electronics/Conductance/opcodes.hpp \
/home/felix/projects/trainOS/include/ker/dictionary.hpp \
/home/felix/projects/trainOS/include/kernel.h \
/home/felix/projects/trainOS/include/ker/pair.hpp \
../../Electronics/Electronics/Tools/fixedstring.hpp \
../include/ker/dictionary.hpp \
../include/kernel.h \
../include/ker/pair.hpp \
../include/ker/fixedstring.hpp \
../../Electronics/Electronics/Conductance/virtualmachine.hpp \
../../Electronics/Electronics/Tools/binaryreader.hpp \
../../Electronics/Electronics/Tools/refcounted.hpp \
../include/ker/referencecounted.hpp \
../include/ker/binaryreader.hpp \
../../Electronics/Electronics/Conductance/assembly.hpp \
../../Electronics/Electronics/Conductance/types/compoundtype.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o thread.o ../../Electronics/Electronics/Conductance/thread.cpp
process.o: ../../Electronics/Electronics/Conductance/process.cpp /home/felix/projects/trainOS/include/kstdlib.h \
/home/felix/projects/trainOS/include/varargs.h \
/home/felix/projects/trainOS/include/config.h \
/home/felix/projects/trainOS/include/malloc.h \
process.o: ../../Electronics/Electronics/Conductance/process.cpp ../include/kstdlib.h \
../include/varargs.h \
../include/config.h \
../include/malloc.h \
../../Electronics/Electronics/Conductance/vmtype.hpp \
../../Electronics/Electronics/Conductance/vmtypes.hpp \
/home/felix/projects/trainOS/include/ker/string.hpp \
/home/felix/projects/trainOS/include/ker/config.hpp \
/home/felix/projects/trainOS/include/ker/vector.hpp \
/home/felix/projects/trainOS/include/ker/new.hpp \
../include/ker/string.hpp \
../include/ker/config.hpp \
../include/ker/vector.hpp \
../include/ker/new.hpp \
../../Electronics/Electronics/Conductance/vmvalue.hpp \
../../Electronics/Electronics/Conductance/opcodes.hpp \
/home/felix/projects/trainOS/include/ker/dictionary.hpp \
/home/felix/projects/trainOS/include/kernel.h \
/home/felix/projects/trainOS/include/ker/pair.hpp \
../../Electronics/Electronics/Tools/fixedstring.hpp \
../include/ker/dictionary.hpp \
../include/kernel.h \
../include/ker/pair.hpp \
../include/ker/fixedstring.hpp \
../../Electronics/Electronics/Conductance/virtualmachine.hpp \
../../Electronics/Electronics/Tools/binaryreader.hpp \
../../Electronics/Electronics/Tools/refcounted.hpp \
../include/ker/referencecounted.hpp \
../include/ker/binaryreader.hpp \
../../Electronics/Electronics/Conductance/assembly.hpp \
../../Electronics/Electronics/Conductance/types/compoundtype.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o process.o ../../Electronics/Electronics/Conductance/process.cpp
instructions.o: ../../Electronics/Electronics/Conductance/instructions.cpp /home/felix/projects/trainOS/include/kstdlib.h \
/home/felix/projects/trainOS/include/varargs.h \
/home/felix/projects/trainOS/include/config.h \
/home/felix/projects/trainOS/include/malloc.h \
instructions.o: ../../Electronics/Electronics/Conductance/instructions.cpp ../include/kstdlib.h \
../include/varargs.h \
../include/config.h \
../include/malloc.h \
../../Electronics/Electronics/Conductance/vmtype.hpp \
../../Electronics/Electronics/Conductance/vmtypes.hpp \
/home/felix/projects/trainOS/include/ker/string.hpp \
/home/felix/projects/trainOS/include/ker/config.hpp \
/home/felix/projects/trainOS/include/ker/vector.hpp \
/home/felix/projects/trainOS/include/ker/new.hpp \
../include/ker/string.hpp \
../include/ker/config.hpp \
../include/ker/vector.hpp \
../include/ker/new.hpp \
../../Electronics/Electronics/Conductance/vmvalue.hpp \
../../Electronics/Electronics/Conductance/opcodes.hpp \
/home/felix/projects/trainOS/include/ker/dictionary.hpp \
/home/felix/projects/trainOS/include/kernel.h \
/home/felix/projects/trainOS/include/ker/pair.hpp \
../../Electronics/Electronics/Tools/fixedstring.hpp \
../include/ker/dictionary.hpp \
../include/kernel.h \
../include/ker/pair.hpp \
../include/ker/fixedstring.hpp \
../../Electronics/Electronics/Conductance/virtualmachine.hpp \
../../Electronics/Electronics/Tools/binaryreader.hpp \
../../Electronics/Electronics/Tools/refcounted.hpp \
../include/ker/referencecounted.hpp \
../include/ker/binaryreader.hpp \
../../Electronics/Electronics/Conductance/assembly.hpp \
../../Electronics/Electronics/Conductance/types/compoundtype.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o instructions.o ../../Electronics/Electronics/Conductance/instructions.cpp
vmprocessidtype.o: ../../Electronics/Electronics/Conductance/types/vmprocessidtype.cpp ../../Electronics/Electronics/Conductance/types/vmprocessidtype.hpp \
../../Electronics/Electronics/Conductance/types/vmprimitivetype.hpp \
/home/felix/projects/trainOS/include/ker/string.hpp \
/home/felix/projects/trainOS/include/kstdlib.h \
/home/felix/projects/trainOS/include/varargs.h \
/home/felix/projects/trainOS/include/config.h \
/home/felix/projects/trainOS/include/malloc.h \
/home/felix/projects/trainOS/include/ker/config.hpp \
../include/ker/string.hpp \
../include/kstdlib.h \
../include/varargs.h \
../include/config.h \
../include/malloc.h \
../include/ker/config.hpp \
../../Electronics/Electronics/Conductance/vmtype.hpp \
../../Electronics/Electronics/Conductance/vmtypes.hpp \
/home/felix/projects/trainOS/include/ker/vector.hpp \
/home/felix/projects/trainOS/include/ker/new.hpp \
../include/ker/vector.hpp \
../include/ker/new.hpp \
../../Electronics/Electronics/Conductance/vmvalue.hpp \
../../Electronics/Electronics/Conductance/opcodes.hpp \
/home/felix/projects/trainOS/include/ker/dictionary.hpp \
/home/felix/projects/trainOS/include/kernel.h \
/home/felix/projects/trainOS/include/ker/pair.hpp \
../../Electronics/Electronics/Tools/fixedstring.hpp
../include/ker/dictionary.hpp \
../include/kernel.h \
../include/ker/pair.hpp \
../include/ker/fixedstring.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o vmprocessidtype.o ../../Electronics/Electronics/Conductance/types/vmprocessidtype.cpp
casts.o: ../../Electronics/Electronics/Conductance/csl/casts.cpp ../../Electronics/Electronics/Conductance/csl/casts.hpp \
../../Electronics/Electronics/Conductance/vmvalue.hpp \
../../Electronics/Electronics/Conductance/vmtypes.hpp \
/home/felix/projects/trainOS/include/ker/string.hpp \
/home/felix/projects/trainOS/include/kstdlib.h \
/home/felix/projects/trainOS/include/varargs.h \
/home/felix/projects/trainOS/include/config.h \
/home/felix/projects/trainOS/include/malloc.h \
/home/felix/projects/trainOS/include/ker/config.hpp \
/home/felix/projects/trainOS/include/ker/vector.hpp \
/home/felix/projects/trainOS/include/ker/new.hpp \
../include/ker/string.hpp \
../include/kstdlib.h \
../include/varargs.h \
../include/config.h \
../include/malloc.h \
../include/ker/config.hpp \
../include/ker/vector.hpp \
../include/ker/new.hpp \
../../Electronics/Electronics/Conductance/vmtype.hpp \
../../Electronics/Electronics/Conductance/opcodes.hpp \
/home/felix/projects/trainOS/include/ker/dictionary.hpp \
/home/felix/projects/trainOS/include/kernel.h \
/home/felix/projects/trainOS/include/ker/pair.hpp \
../../Electronics/Electronics/Tools/fixedstring.hpp
../include/ker/dictionary.hpp \
../include/kernel.h \
../include/ker/pair.hpp \
../include/ker/fixedstring.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o casts.o ../../Electronics/Electronics/Conductance/csl/casts.cpp
object.o: ../../Electronics/Electronics/Conductance/object.cpp ../../Electronics/Electronics/Conductance/virtualmachine.hpp \
../include/ker/string.hpp \
../include/kstdlib.h \
../include/varargs.h \
../include/config.h \
../include/malloc.h \
../include/ker/config.hpp \
../include/ker/dictionary.hpp \
../include/kernel.h \
../include/ker/pair.hpp \
../include/ker/vector.hpp \
../include/ker/new.hpp \
../include/ker/referencecounted.hpp \
../include/ker/binaryreader.hpp \
../include/ker/fixedstring.hpp \
../../Electronics/Electronics/Conductance/opcodes.hpp \
../../Electronics/Electronics/Conductance/vmtypes.hpp \
../../Electronics/Electronics/Conductance/assembly.hpp \
../../Electronics/Electronics/Conductance/vmtype.hpp \
../../Electronics/Electronics/Conductance/vmvalue.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o object.o ../../Electronics/Electronics/Conductance/object.cpp
module.o: ../../Electronics/Electronics/Conductance/module.cpp ../../Electronics/Electronics/Conductance/virtualmachine.hpp \
../include/ker/string.hpp \
../include/kstdlib.h \
../include/varargs.h \
../include/config.h \
../include/malloc.h \
../include/ker/config.hpp \
../include/ker/dictionary.hpp \
../include/kernel.h \
../include/ker/pair.hpp \
../include/ker/vector.hpp \
../include/ker/new.hpp \
../include/ker/referencecounted.hpp \
../include/ker/binaryreader.hpp \
../include/ker/fixedstring.hpp \
../../Electronics/Electronics/Conductance/opcodes.hpp \
../../Electronics/Electronics/Conductance/vmtypes.hpp \
../../Electronics/Electronics/Conductance/assembly.hpp \
../../Electronics/Electronics/Conductance/vmtype.hpp \
../../Electronics/Electronics/Conductance/vmvalue.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o module.o ../../Electronics/Electronics/Conductance/module.cpp
####### Install
install: FORCE

20
src/vm.cpp
View file

@ -128,12 +128,12 @@ extern "C" void vm_start(const MultibootStructure *mbHeader)
size_t len = mod[i].end - mod[i].start;
Assembly *assembly = machine.load(reinterpret_cast<void*>(mod[i].start), len);
if(assembly == nullptr) {
Module *module = machine.load(reinterpret_cast<void*>(mod[i].start), len);
if(module == nullptr) {
die("Failed to load assembly.");
return;
}
switch(assembly->type())
switch(module->type())
{
case AssemblyType::Library:
{
@ -142,7 +142,7 @@ extern "C" void vm_start(const MultibootStructure *mbHeader)
}
case AssemblyType::Executable:
{
Process *program = machine.createProcess(assembly, false);
Process *program = machine.createProcess(module, false);
if(program == nullptr) {
die("Failed to create process.");
return;
@ -152,7 +152,7 @@ extern "C" void vm_start(const MultibootStructure *mbHeader)
}
case AssemblyType::Service:
{
Process *program = machine.createProcess(assembly, true);
Process *program = machine.createProcess(module, true);
if(program == nullptr) {
die("Failed to create service process.");
return;
@ -162,13 +162,13 @@ extern "C" void vm_start(const MultibootStructure *mbHeader)
}
case AssemblyType::Driver:
{
Process *program = machine.createProcess(assembly, true);
Process *program = machine.createProcess(module, true);
if(program == nullptr) {
die("Failed to create driver process.");
return;
}
if(assembly->exports().contains("irq")) {
drivers.append({ program, assembly->exports()["irq"] });
}
if(module->exports().contains("irq")) {
drivers.append({ program, module->exports()["irq"] });
} else {
program->release();
}
@ -180,7 +180,7 @@ extern "C" void vm_start(const MultibootStructure *mbHeader)
break;
}
}
assembly->release();
module->release();
}
while((shutdownRequested == false) && machine.step())