Merge branch 'master' of github.com:folkertvanheusden/kek
This commit is contained in:
commit
801dbee4e1
4 changed files with 6 additions and 5 deletions
|
@ -6,8 +6,8 @@ cmake_minimum_required(VERSION 3.9)
|
||||||
|
|
||||||
add_compile_options(-Wall -pedantic -Wextra)
|
add_compile_options(-Wall -pedantic -Wextra)
|
||||||
|
|
||||||
#add_compile_options(-fsanitize=address)
|
#add_compile_options(-fsanitize=undefined)
|
||||||
#add_link_options(-fsanitize=address)
|
#add_link_options(-fsanitize=undefined)
|
||||||
|
|
||||||
set(CMAKE_CXX_STANDARD 17)
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED True)
|
set(CMAKE_CXX_STANDARD_REQUIRED True)
|
||||||
|
|
|
@ -17,7 +17,7 @@ board_build.filesystem = littlefs
|
||||||
lib_deps = greiman/SdFat@^2.1.2
|
lib_deps = greiman/SdFat@^2.1.2
|
||||||
adafruit/Adafruit NeoPixel
|
adafruit/Adafruit NeoPixel
|
||||||
bblanchon/ArduinoJson@^6.19.4
|
bblanchon/ArduinoJson@^6.19.4
|
||||||
build_flags = -std=gnu++2a -DESP32=1 -ggdb3 -D_GLIBCXX_USE_C99
|
build_flags = -std=gnu++2a -DESP32=1 -ggdb3 -D_GLIBCXX_USE_C99 -Wall
|
||||||
build_unflags = -std=gnu++11 -std=gnu++17
|
build_unflags = -std=gnu++11 -std=gnu++17
|
||||||
extra_scripts = pre:prepare.py
|
extra_scripts = pre:prepare.py
|
||||||
|
|
||||||
|
|
|
@ -101,12 +101,12 @@ std::pair<breakpoint_register *, std::optional<std::string> > breakpoint_registe
|
||||||
else if (key == "PC" || key == "pc") {
|
else if (key == "PC" || key == "pc") {
|
||||||
return { new breakpoint_register(b, 7, values), { } };
|
return { new breakpoint_register(b, 7, values), { } };
|
||||||
}
|
}
|
||||||
else if (key.substr(0, 3) == "MMR" or key.substr(0, 3) == "mmr") {
|
else if (key.substr(0, 3) == "MMR" || key.substr(0, 3) == "mmr") {
|
||||||
int which = key[3] - '0';
|
int which = key[3] - '0';
|
||||||
|
|
||||||
return { new breakpoint_register(b, hr_mmr0 + which, values), { } };
|
return { new breakpoint_register(b, hr_mmr0 + which, values), { } };
|
||||||
}
|
}
|
||||||
else if (key.substr(0, 3) == "PSW" or key.substr(0, 3) == "psw") {
|
else if (key.substr(0, 3) == "PSW" || key.substr(0, 3) == "psw") {
|
||||||
return { new breakpoint_register(b, hr_psw, values), { } };
|
return { new breakpoint_register(b, hr_psw, values), { } };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
1
mmu.cpp
1
mmu.cpp
|
@ -9,6 +9,7 @@
|
||||||
|
|
||||||
mmu::mmu()
|
mmu::mmu()
|
||||||
{
|
{
|
||||||
|
reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
mmu::~mmu()
|
mmu::~mmu()
|
||||||
|
|
Loading…
Add table
Reference in a new issue