The-Homebrew-Cloud/sys-patch
2
0
Fork 0
mirror of https://github.com/ITotalJustice/sys-patch.git synced 2025-01-08 08:10:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix detecting if nifm ctest patch is already applied

Browse Source 
the patch itself always worked, however it failed to detect if the patch was already applied.
this isn't a big issue, and the only one to notice was probably me ;)
This commit is contained in:
TotalJustice 2023-05-27 23:40:19 +01:00
parent 3da8f21d20
commit d5fbbd40d3
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -2,7 +2,7 @@ MAKEFILES := sysmod overlay
TARGETS := $(foreach dir,$(MAKEFILES),$(CURDIR)/$(dir)) TARGETS := $(foreach dir,$(MAKEFILES),$(CURDIR)/$(dir))
# the below was taken from atmosphere + switch-examples makefile # the below was taken from atmosphere + switch-examples makefile
export VERSION := 1.4.0 export VERSION := 1.4.1
export GIT_BRANCH := $(shell git symbolic-ref --short HEAD) export GIT_BRANCH := $(shell git symbolic-ref --short HEAD)
ifeq ($(strip $(shell git status --porcelain 2>/dev/null)),) ifeq ($(strip $(shell git status --porcelain 2>/dev/null)),)

1
README.md
View File

@ -101,3 +101,4 @@ Software is built on the shoulders of giants. This tool wouldn't be possible wit
- DevkitPro (toolchain) - DevkitPro (toolchain)
- [minIni](https://github.com/compuphase/minIni) - [minIni](https://github.com/compuphase/minIni)
- [libtesla](https://github.com/WerWolv/libtesla) - [libtesla](https://github.com/WerWolv/libtesla)
- [Shoutout to the best switch cfw setup guide](https://rentry.org/SwitchHackingIsEasy)

8
sysmod/src/main.cpp
View File

@ -176,14 +176,14 @@ constexpr auto bne_cond(u32 inst) -> bool {
} }
constexpr auto ctest_cond(u32 inst) -> bool { constexpr auto ctest_cond(u32 inst) -> bool {
return true; // we overwrite the function so we don't care to check return std::byteswap(0xF50301AA) == inst; // mov x21, x1
} }
// to view patches, use https://armconverter.com/?lock=arm64 // to view patches, use https://armconverter.com/?lock=arm64
constexpr PatchData ret0_patch_data{ "0xE0031F2A" }; constexpr PatchData ret0_patch_data{ "0xE0031F2A" };
constexpr PatchData nop_patch_data{ "0x1F2003D5" }; constexpr PatchData nop_patch_data{ "0x1F2003D5" };
constexpr PatchData mov0_patch_data{ "0xE0031FAA" }; constexpr PatchData mov0_patch_data{ "0xE0031FAA" };
constexpr PatchData ctest_patch_data{ "00309AD2001EA1F2610100D4E0031FAAC0035FD6" }; constexpr PatchData ctest_patch_data{ "0x00309AD2001EA1F2610100D4E0031FAAC0035FD6" };
constexpr auto ret0_patch(u32 inst) -> PatchData { return ret0_patch_data; } constexpr auto ret0_patch(u32 inst) -> PatchData { return ret0_patch_data; }
constexpr auto nop_patch(u32 inst) -> PatchData { return nop_patch_data; } constexpr auto nop_patch(u32 inst) -> PatchData { return nop_patch_data; }
@ -248,7 +248,7 @@ constinit Patterns es_patterns[] = {
}; };
constinit Patterns nifm_patterns[] = { constinit Patterns nifm_patterns[] = {
{ "ctest", "................F50301AAF40300AA....F30314AAE00314AA9F0201397F8E04F8", 0, 0, ctest_cond, ctest_patch, ctest_applied, true }, { "ctest", "....................F40300AA....F30314AAE00314AA9F0201397F8E04F8", 16, -16, ctest_cond, ctest_patch, ctest_applied, true },
}; };
// NOTE: add system titles that you want to be patched to this table. // NOTE: add system titles that you want to be patched to this table.
@ -338,7 +338,7 @@ void patcher(Handle handle, std::span<const u8> data, u64 addr, std::span<Patter
} }
// move onto next pattern // move onto next pattern
break; break;
} else if (p.applied(data.data() + inst_offset, inst)) { } else if (p.applied(data.data() + inst_offset + p.patch_offset, inst)) {
// patch already applied by sigpatches // patch already applied by sigpatches
p.result = PatchResult::PATCHED_FILE; p.result = PatchResult::PATCHED_FILE;
break; break;