mirror of
https://github.com/Atmosphere-NX/Atmosphere.git
synced 2024-11-09 21:51:45 +00:00
git subrepo pull emummc
subrepo: subdir: "emummc" merged: "44ecdb45" upstream: origin: "https://github.com/m4xw/emuMMC" branch: "develop" commit: "44ecdb45" git-subrepo: version: "0.4.0" origin: "https://github.com/ingydotnet/git-subrepo" commit: "5d6aba9"
This commit is contained in:
parent
31fde233e1
commit
63a9c856fc
5 changed files with 39 additions and 23 deletions
|
@ -6,7 +6,7 @@
|
||||||
[subrepo]
|
[subrepo]
|
||||||
remote = https://github.com/m4xw/emuMMC
|
remote = https://github.com/m4xw/emuMMC
|
||||||
branch = develop
|
branch = develop
|
||||||
commit = b9ac428bc24582aa5a2b563f800a4ac80fe65585
|
commit = 44ecdb457a59d365423e7bd7e312253e87b2e176
|
||||||
parent = 0bf7df04262ea057b4cb48051cd43b4e19594d4e
|
parent = 31fde233e177ba53e1359686f01ed4188c3a282e
|
||||||
method = rebase
|
method = rebase
|
||||||
cmdver = 0.4.0
|
cmdver = 0.4.0
|
||||||
|
|
|
@ -47,9 +47,9 @@
|
||||||
// Nintendo Paths
|
// Nintendo Paths
|
||||||
#define FS_OFFSET_400_NINTENDO_PATHS \
|
#define FS_OFFSET_400_NINTENDO_PATHS \
|
||||||
{ \
|
{ \
|
||||||
{.opcode_reg = 3, .adrp_offset = 0x0002023C, .add_rel_offset = 4}, \
|
{.opcode_reg = 3, .adrp_offset = 0x0002023C, .add_rel_offset = 0x00000004}, \
|
||||||
{.opcode_reg = 3, .adrp_offset = 0x00021BE8, .add_rel_offset = 4}, \
|
{.opcode_reg = 3, .adrp_offset = 0x00021BE8, .add_rel_offset = 0x0000000C}, \
|
||||||
{.opcode_reg = 3, .adrp_offset = 0x00021EC4, .add_rel_offset = 4}, \
|
{.opcode_reg = 3, .adrp_offset = 0x00021EC4, .add_rel_offset = 0x0000000C}, \
|
||||||
{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
|
{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -47,9 +47,9 @@
|
||||||
// Nintendo Paths
|
// Nintendo Paths
|
||||||
#define FS_OFFSET_400_EXFAT_NINTENDO_PATHS \
|
#define FS_OFFSET_400_EXFAT_NINTENDO_PATHS \
|
||||||
{ \
|
{ \
|
||||||
{.opcode_reg = 3, .adrp_offset = 0x0002023C, .add_rel_offset = 4}, \
|
{.opcode_reg = 3, .adrp_offset = 0x0002023C, .add_rel_offset = 0x00000004}, \
|
||||||
{.opcode_reg = 3, .adrp_offset = 0x00021BE8, .add_rel_offset = 4}, \
|
{.opcode_reg = 3, .adrp_offset = 0x00021BE8, .add_rel_offset = 0x0000000C}, \
|
||||||
{.opcode_reg = 3, .adrp_offset = 0x00021EC4, .add_rel_offset = 4}, \
|
{.opcode_reg = 3, .adrp_offset = 0x00021EC4, .add_rel_offset = 0x0000000C}, \
|
||||||
{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
|
{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -47,9 +47,9 @@
|
||||||
// Nintendo Paths
|
// Nintendo Paths
|
||||||
#define FS_OFFSET_410_NINTENDO_PATHS \
|
#define FS_OFFSET_410_NINTENDO_PATHS \
|
||||||
{ \
|
{ \
|
||||||
{.opcode_reg = 3, .adrp_offset = 0x0002023C, .add_rel_offset = 4}, \
|
{.opcode_reg = 3, .adrp_offset = 0x0002023C, .add_rel_offset = 0x00000004}, \
|
||||||
{.opcode_reg = 3, .adrp_offset = 0x00021BE8, .add_rel_offset = 12}, \
|
{.opcode_reg = 3, .adrp_offset = 0x00021BE8, .add_rel_offset = 0x0000000C}, \
|
||||||
{.opcode_reg = 3, .adrp_offset = 0x00021EC4, .add_rel_offset = 12}, \
|
{.opcode_reg = 3, .adrp_offset = 0x00021EC4, .add_rel_offset = 0x0000000C}, \
|
||||||
{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
|
{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
ParseClipboard()
|
ParseClipboard()
|
||||||
|
|
||||||
Func FormatLineData($sLineData)
|
Func FormatLineData($sLineData, $sLineDataAdd)
|
||||||
Local $lineData = StringReplace($sLineData, @TAB, " ")
|
Local $lineData = StringReplace($sLineData, @TAB, " ")
|
||||||
|
Local $lineDataADRP, $lineDataADD
|
||||||
Local $isADRP = false
|
Local $isADRP = false
|
||||||
$lineData = StringReplace($lineData, "Up o sub_71000" , "0x")
|
$lineData = StringReplace($lineData, "Up o sub_71000" , "0x")
|
||||||
$isADRP = StringInStr($lineData, "ADRP")
|
$isADRP = StringInStr($lineData, "ADRP")
|
||||||
|
@ -13,24 +14,39 @@ Func FormatLineData($sLineData)
|
||||||
|
|
||||||
$lineDataAddr = StringReplace($lineDataAddr, "0x" , "")
|
$lineDataAddr = StringReplace($lineDataAddr, "0x" , "")
|
||||||
$lineDataAddition = StringReplace($lineDataAddition, "0x" , "")
|
$lineDataAddition = StringReplace($lineDataAddition, "0x" , "")
|
||||||
|
$addrADRP = Dec($lineDataAddr) + Dec($lineDataAddition)
|
||||||
|
|
||||||
If $isADRP Then
|
$lineDataADRP = "0x" & Hex($addrADRP)
|
||||||
$lineData = "0x" & Hex(Dec($lineDataAddr) + Dec($lineDataAddition))
|
|
||||||
Else
|
|
||||||
Return ""
|
|
||||||
EndIf
|
|
||||||
|
|
||||||
Return "{.opcode_reg = " & $targetRegister & ", .adrp_offset = " & $lineData & "}, \" & @LF
|
Local $lineDataADD = StringReplace($sLineDataAdd, @TAB, " ")
|
||||||
|
Local $isADD = false
|
||||||
|
$lineDataADD = StringReplace($lineDataADD, "Up o sub_71000" , "0x")
|
||||||
|
$isADD = StringInStr($lineData, "ADD")
|
||||||
|
|
||||||
|
$lineDataADD = StringSplit($lineDataADD, " ")[1]
|
||||||
|
$lineDataAddAddr = StringSplit($lineDataADD, "+")[1]
|
||||||
|
$lineDataAddAddition = StringSplit($lineDataADD, "+")[2]
|
||||||
|
|
||||||
|
$lineDataAddAddr = StringReplace($lineDataAddAddr, "0x" , "")
|
||||||
|
$lineDataAddAddition = StringReplace($lineDataAddAddition, "0x" , "")
|
||||||
|
$addrADD = Dec($lineDataAddAddr) + Dec($lineDataAddAddition)
|
||||||
|
$addrADD = $addrADD - $addrADRP
|
||||||
|
$lineDataADD = "0x" & Hex($addrADD)
|
||||||
|
|
||||||
|
Return @TAB & "{.opcode_reg = " & $targetRegister & ", .adrp_offset = " & $lineDataADRP & ", .add_rel_offset = " & $lineDataADD & "}, \" & @LF
|
||||||
EndFunc
|
EndFunc
|
||||||
|
|
||||||
Func ParseClipboard()
|
Func ParseClipboard()
|
||||||
Local $sData = ClipGet()
|
Local $sData = ClipGet()
|
||||||
Local $oData = ""
|
Local $oData = ""
|
||||||
Local $sLineData = StringSplit(StringReplace($sData, @CRLF, @LF), @LF)
|
Local $sLineData = StringSplit(StringReplace($sData, @CRLF, @LF), @LF)
|
||||||
For $i = 2 to UBound($sLineData) - 2
|
For $i = 2 to UBound($sLineData) - 2 Step 2
|
||||||
Local $lineData = FormatLineData($sLineData[$i])
|
Local $lineData = FormatLineData($sLineData[$i], $sLineData[$i+1])
|
||||||
;ConsoleWrite($lineData)
|
;ConsoleWrite($lineData)
|
||||||
$oData = $oData & $lineData
|
$oData = $oData & $lineData
|
||||||
Next
|
Next
|
||||||
|
|
||||||
|
$oData = "{ \" & @LF & $oData & @TAB & "{.opcode_reg = 0, .adrp_offset = 0, .add_rel_offset = 0}, \" & @LF & "}" & @LF
|
||||||
|
;ConsoleWrite($oData)
|
||||||
ClipPut($oData)
|
ClipPut($oData)
|
||||||
EndFunc
|
EndFunc
|
||||||
|
|
Loading…
Reference in a new issue