diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c1a393..8d183a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) cmake_minimum_required(VERSION 3.18) project(${PROJ_NAME} LANGUAGES C CXX) set(CMAKE_BUILD_TYPE Debug) -set(CMAKE_CXX_STANDARD 23) +set(CMAKE_CXX_STANDARD 20) file(STRINGS "./build.nr" BUILD_NUMBER) #----------------------------------------------------------------------------------------- diff --git a/build.nr b/build.nr index 7b222bc..00e37d6 100644 --- a/build.nr +++ b/build.nr @@ -1 +1 @@ -1593 +1596 diff --git a/extra/dragon/disk1.dr b/extra/dragon/disk1.dr index d76708f..41d685e 100644 Binary files a/extra/dragon/disk1.dr and b/extra/dragon/disk1.dr differ diff --git a/extra/dss/bios_api.dss b/extra/dss/bios_api.dss index a25f9a0..1db7612 100644 --- a/extra/dss/bios_api.dss +++ b/extra/dss/bios_api.dss @@ -1,5 +1,5 @@ ## -- -## -- This file is automatically generated by the DragonAssembler (version 0.3.1592) +## -- This file is automatically generated by the DragonAssembler (version 0.3.1595) ## -- Please do not modify this file in any way. ## -- diff --git a/extra/dss/drake/bootsector.dss b/extra/dss/drake/bootsector.dss index a36494e..15ba6b5 100644 --- a/extra/dss/drake/bootsector.dss +++ b/extra/dss/drake/bootsector.dss @@ -1,8 +1,7 @@ -.load 0x0000 - -@define S_REG_3 0x09 +.load [dynamic] .data + $string "Hello BOOTSECTOR!!" .code mov R10, 0xE0 @@ -11,5 +10,3 @@ mov R9, $string int 0x30 -.dynamic_data - $string "Hello BOOTSECTOR!!" diff --git a/extra/dss/drake/loader.dss b/extra/dss/drake/loader.dss index dcf32f6..e674d0f 100644 --- a/extra/dss/drake/loader.dss +++ b/extra/dss/drake/loader.dss @@ -2,6 +2,10 @@ @include <../bios_api.dss> +@define S_REG_1 0x07 +@define S_REG_2 0x08 +@define S_REG_3 0x09 + .data $_drake_logo_line_1 " ___ ___ ___ __ ______" $_drake_logo_line_2 " / _ \/ _ \/ _ | / //_/ __/" diff --git a/extra/make_and_debug b/extra/make_and_debug index 173f08d..6ee9871 100755 --- a/extra/make_and_debug +++ b/extra/make_and_debug @@ -14,7 +14,7 @@ printf "${green}\n============================================================== if [ $? -eq 0 ]; then cd scripts /bin/bash ./bios_flash - cp dss/bios_api.dss ../extra/dss/bios_api.dss + cp ../dss/bios_api.dss ../../extra/dss/bios_api.dss /bin/bash ./load_mbr cd .. printf "${green}Compiling Test Program...\n" diff --git a/extra/make_and_run b/extra/make_and_run index 1fc5120..4605bc7 100755 --- a/extra/make_and_run +++ b/extra/make_and_run @@ -14,7 +14,7 @@ printf "${green}\n============================================================== if [ $? -eq 0 ]; then cd scripts /bin/bash ./bios_flash - cp dss/bios_api.dss ../extra/dss/bios_api.dss + cp ../dss/bios_api.dss ../../extra/dss/bios_api.dss /bin/bash ./load_mbr cd .. printf "${green}Compiling Test Program...\n"