From 3e55654df82a278b360c619530522390c0c02b5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Quei=C3=9Fner?= Date: Wed, 21 Oct 2015 21:32:14 +0200 Subject: [PATCH] Refreshes some files to fit refactorings. --- Makefile | 31 ++- conductance/Makefile | 473 ++++++++++++++++++++++---------------- include/ker/pair.hpp | 12 + scripts/keyboard.cu | 1 - scripts/keyboard.cu.spark | 2 +- scripts/main.cu.spark | 2 +- src/vm.cpp | 3 + 7 files changed, 301 insertions(+), 223 deletions(-) diff --git a/Makefile b/Makefile index b4e3191..e6789a5 100644 --- a/Makefile +++ b/Makefile @@ -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/module.o conductance/object.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/module.o conductance/object.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 diff --git a/conductance/Makefile b/conductance/Makefile index 15d88cb..10a6269 100644 --- a/conductance/Makefile +++ b/conductance/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: libConductance.a -# Generated by qmake (3.0) (Qt 5.5.0) +# Generated by qmake (3.0) (Qt 5.5.1) # Project: ../../Electronics/Electronics/Conductance/Conductance.pro # Template: lib # Command: /usr/lib/qt/bin/qmake -spec linux-g++ CONFIG+=debug CONFIG+=CircuitOS -o Makefile ../../Electronics/Electronics/Conductance/Conductance.pro @@ -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 @@ -87,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 \ @@ -122,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 \ @@ -144,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 \ @@ -160,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 \ @@ -182,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 \ @@ -299,6 +317,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 \ @@ -334,6 +353,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 \ @@ -356,8 +377,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 \ @@ -372,6 +399,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 \ @@ -394,8 +422,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 \ @@ -444,6 +480,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: @@ -479,6 +516,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: @@ -501,8 +540,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: @@ -517,6 +562,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: @@ -539,8 +585,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: @@ -619,119 +673,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 \ - /home/felix/projects/trainOS/include/ker/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 \ - /home/felix/projects/trainOS/include/ker/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 \ - /home/felix/projects/trainOS/include/ker/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 \ - /home/felix/projects/trainOS/include/ker/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 \ - /home/felix/projects/trainOS/include/ker/referencecounted.hpp \ - /home/felix/projects/trainOS/include/ker/fixedstring.hpp \ - /home/felix/projects/trainOS/include/ker/binarywriter.hpp \ - /home/felix/projects/trainOS/include/ker/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 \ - /home/felix/projects/trainOS/include/ker/fixedstring.hpp \ + ../include/ker/dictionary.hpp \ + ../include/kernel.h \ + ../include/ker/pair.hpp \ + ../include/ker/fixedstring.hpp \ ../../Electronics/Electronics/Conductance/virtualmachine.hpp \ - /home/felix/projects/trainOS/include/ker/referencecounted.hpp \ - /home/felix/projects/trainOS/include/ker/binaryreader.hpp \ + ../include/ker/referencecounted.hpp \ + ../include/ker/binaryreader.hpp \ ../../Electronics/Electronics/Conductance/assembly.hpp \ ../../Electronics/Electronics/Conductance/module.hpp \ ../../Electronics/Electronics/Conductance/process.hpp \ @@ -745,20 +799,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 \ - /home/felix/projects/trainOS/include/ker/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 @@ -766,102 +820,103 @@ 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 \ - /home/felix/projects/trainOS/include/ker/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 \ - /home/felix/projects/trainOS/include/ker/fixedstring.hpp \ + ../include/ker/dictionary.hpp \ + ../include/kernel.h \ + ../include/ker/pair.hpp \ + ../include/ker/fixedstring.hpp \ ../../Electronics/Electronics/Conductance/thread.hpp \ - /home/felix/projects/trainOS/include/ker/binaryreader.hpp \ - /home/felix/projects/trainOS/include/ker/referencecounted.hpp \ + ../include/ker/binaryreader.hpp \ + ../include/ker/referencecounted.hpp \ ../../Electronics/Electronics/Conductance/assembly.hpp \ ../../Electronics/Electronics/Conductance/process.hpp \ ../../Electronics/Electronics/Conductance/object.hpp \ ../../Electronics/Electronics/Conductance/module.hpp \ - ../../Electronics/Electronics/Conductance/types/compoundtype.hpp + ../../Electronics/Electronics/Conductance/types/compoundtype.hpp \ + ../include/ker/todo.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 \ - /home/felix/projects/trainOS/include/ker/fixedstring.hpp \ + ../include/ker/dictionary.hpp \ + ../include/kernel.h \ + ../include/ker/pair.hpp \ + ../include/ker/fixedstring.hpp \ ../../Electronics/Electronics/Conductance/process.hpp \ ../../Electronics/Electronics/Conductance/object.hpp \ - /home/felix/projects/trainOS/include/ker/referencecounted.hpp \ + ../include/ker/referencecounted.hpp \ ../../Electronics/Electronics/Conductance/thread.hpp \ - /home/felix/projects/trainOS/include/ker/binaryreader.hpp \ + ../include/ker/binaryreader.hpp \ ../../Electronics/Electronics/Conductance/assembly.hpp \ ../../Electronics/Electronics/Conductance/module.hpp \ ../../Electronics/Electronics/Conductance/virtualmachine.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 \ - /home/felix/projects/trainOS/include/ker/fixedstring.hpp \ + ../include/ker/dictionary.hpp \ + ../include/kernel.h \ + ../include/ker/pair.hpp \ + ../include/ker/fixedstring.hpp \ ../../Electronics/Electronics/Conductance/thread.hpp \ - /home/felix/projects/trainOS/include/ker/binaryreader.hpp \ - /home/felix/projects/trainOS/include/ker/referencecounted.hpp \ + ../include/ker/binaryreader.hpp \ + ../include/ker/referencecounted.hpp \ ../../Electronics/Electronics/Conductance/assembly.hpp \ ../../Electronics/Electronics/Conductance/process.hpp \ ../../Electronics/Electronics/Conductance/object.hpp \ @@ -872,82 +927,92 @@ instructions.o: ../../Electronics/Electronics/Conductance/instructions.cpp /home 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 \ - /home/felix/projects/trainOS/include/ker/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 \ - /home/felix/projects/trainOS/include/ker/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/object.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/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/ker/new.hpp \ - /home/felix/projects/trainOS/include/ker/referencecounted.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 \ ../../Electronics/Electronics/Conductance/module.hpp \ ../../Electronics/Electronics/Conductance/assembly.hpp \ - ../../Electronics/Electronics/Conductance/vmtypes.hpp + ../../Electronics/Electronics/Conductance/vmtypes.hpp \ + ../../Electronics/Electronics/Conductance/process.hpp \ + ../../Electronics/Electronics/Conductance/vmvalue.hpp \ + ../../Electronics/Electronics/Conductance/thread.hpp \ + ../include/ker/binaryreader.hpp \ + ../include/ker/fixedstring.hpp \ + ../../Electronics/Electronics/Conductance/opcodes.hpp \ + ../include/ker/todo.hpp \ + ../../Electronics/Electronics/Conductance/virtualmachine.hpp \ + ../../Electronics/Electronics/Conductance/vmtype.hpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o object.o ../../Electronics/Electronics/Conductance/object.cpp module.o: ../../Electronics/Electronics/Conductance/module.cpp ../../Electronics/Electronics/Conductance/module.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/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/ker/new.hpp \ - /home/felix/projects/trainOS/include/ker/referencecounted.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 \ ../../Electronics/Electronics/Conductance/assembly.hpp \ ../../Electronics/Electronics/Conductance/vmtypes.hpp \ ../../Electronics/Electronics/Conductance/virtualmachine.hpp \ - /home/felix/projects/trainOS/include/ker/binaryreader.hpp \ - /home/felix/projects/trainOS/include/ker/fixedstring.hpp \ + ../include/ker/binaryreader.hpp \ + ../include/ker/fixedstring.hpp \ ../../Electronics/Electronics/Conductance/vmtype.hpp \ ../../Electronics/Electronics/Conductance/vmvalue.hpp \ - ../../Electronics/Electronics/Conductance/opcodes.hpp + ../../Electronics/Electronics/Conductance/opcodes.hpp \ + ../include/ker/todo.hpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o module.o ../../Electronics/Electronics/Conductance/module.cpp ####### Install diff --git a/include/ker/pair.hpp b/include/ker/pair.hpp index 250d96a..9527793 100644 --- a/include/ker/pair.hpp +++ b/include/ker/pair.hpp @@ -39,4 +39,16 @@ namespace ker return *this; } }; + + template + static inline bool operator == (const Pair &lhs, const Pair &rhs) + { + return (lhs.first == rhs.first) && (lhs.second == rhs.second); + } + + template + static inline bool operator != (const Pair &lhs, const Pair &rhs) + { + return (lhs.first != rhs.first) || (lhs.second != rhs.second); + } } diff --git a/scripts/keyboard.cu b/scripts/keyboard.cu index bdbecd8..e99f563 100644 --- a/scripts/keyboard.cu +++ b/scripts/keyboard.cu @@ -1,4 +1,3 @@ - .asmtype DRIVER .name KEYBOARDDRIVER diff --git a/scripts/keyboard.cu.spark b/scripts/keyboard.cu.spark index a9c866b..6559b93 100644 --- a/scripts/keyboard.cu.spark +++ b/scripts/keyboard.cu.spark @@ -1,6 +1,6 @@ ; ============================================= ; compiled with Copper 1.0 -; 2015-10-17 10:35:30 +; 2015-10-21 21:27:53 ; ============================================= ; USE /home/felix/projects/Electronics/libs/standard.cul diff --git a/scripts/main.cu.spark b/scripts/main.cu.spark index 5a6dd1b..fd61834 100644 --- a/scripts/main.cu.spark +++ b/scripts/main.cu.spark @@ -1,6 +1,6 @@ ; ============================================= ; compiled with Copper 1.0 -; 2015-10-16 13:32:19 +; 2015-10-21 21:27:41 ; ============================================= ; native method: print(…) diff --git a/src/vm.cpp b/src/vm.cpp index 409033b..7d3db78 100644 --- a/src/vm.cpp +++ b/src/vm.cpp @@ -5,6 +5,9 @@ #include #include +#include +#include + #include #include