[LoongArch64] Add ProbeLoongArch64Quirks() for R2RDump tool. - #102146

Merged
jkotas merged 5 commits into
dotnet:mainfrom
LuckyXu-HF:main-LA64
May 18, 2024
Merged

[LoongArch64] Add ProbeLoongArch64Quirks() for R2RDump tool.#102146
jkotas merged 5 commits into
dotnet:mainfrom
LuckyXu-HF:main-LA64

Conversation

@LuckyXu-HF

Copy link
Copy Markdown
Contributor

Add ProbeLoongArch64Quirks() for R2RDump to display the call method name and the branch address. This makes the r2rdump log more readable.

@ghostghost added the area-R2RDump-coreclr Ready-to-run image dump tool label May 13, 2024
@dotnet-policy-servicedotnet-policy-serviceBot added the community-contribution Indicates that the PR has been added by a community member label May 13, 2024
@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

This is mentioned by #101683 (comment)
@am11 , thanks again for your notification!

After implement ProbeLoongArch64Quirks(), the change is liking:
e.g: S.P.C.dll - PE32+ : string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Before:

string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Handle: 0x06000053
Rid: 83
EntryPointRuntimeFunctionId: 76
Number of RuntimeFunctions: 1
Number of fixups: 1
TableIndex 5, Offset 06DB: System.Span`1<char> (TYPE_HANDLE)
string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Id: 76
StartAddress: 0x00144E80
Size: 176 bytes
UnwindRVA: 0x00011428
Debug Info
Bounds:
Native Offset: 0x0, Prolog, Source Types: StackEmpty
Native Offset: 0x18, IL Offset: 0x0000, Source Types: StackEmpty
Native Offset: 0x20, IL Offset: 0x000a, Source Types: StackEmpty
Native Offset: 0x24, IL Offset: 0x000e, Source Types: StackEmpty
Native Offset: 0x2C, IL Offset: 0x0012, Source Types: StackEmpty
Native Offset: 0x50, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x64, IL Offset: 0x002b, Source Types: StackEmpty
Native Offset: 0x78, Epilog, Source Types: StackEmpty
Native Offset: 0x88, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x9C, NoMapping, Source Types: StackEmpty
Variable Locations:
Variable Number: 0
Start Offset: 0x0
End Offset: 0x18
Loc Type: VLT_REG
Register: A0
Variable Number: 1
Start Offset: 0x1C
End Offset: 0x5C
Loc Type: VLT_REG
Register: T8
144e80: 02ff8063 addi.d $sp, $sp, -32
144e84: 29c04076 st.d $r22, $sp, 16
144e88: 29c06061 st.d $ra, $sp, 24
144e8c: 02c04076 addi.d $r22, $sp, 16
144e90: 29ffc2c0 st.d $zero, $r22, -16
144e94: 004080a5 slli.w $r5, $r5, 0
144e98: 004080b4 slli.w $r20, $r5, 0
144e9c: 50000800 b 8
144ea0: 004080d4 slli.w $r20, $r6, 0
144ea4: 00408295 slli.w $r21, $r20, 0
144ea8: 64002815 bge $zero, $r21, 40
144eac: 02bffe86 addi.w $r6, $r20, -1
144eb0: 004080d5 slli.w $r21, $r6, 0
144eb4: 6c006aa5 bgeu $r21, $r5, 104
144eb8: 00df00c7 bstrpick.d $r7, $r6, 31, 0
144ebc: 004104e7 slli.d $r7, $r7, 1
144ec0: 38241c87 ldx.hu $r7, $r4, $r7
144ec4: 004080f5 slli.w $r21, $r7, 0
144ec8: 02808001 addi.w $ra, $zero, 32
144ecc: 67ffd435 bge $ra, $r21, -44
144ed0: 00df0281 bstrpick.d $ra, $r20, 31, 0
144ed4: 00df00b5 bstrpick.d $r21, $r5, 31, 0
144ed8: 680032a1 bltu $r21, $ra, 48
144edc: 29ffc2c4 st.d $r4, $r22, -16
144ee0: 29bfe2d4 st.w $r20, $r22, -8
144ee4: 02ffc2c4 addi.d $r4, $r22, -16
A0 is dead
144ee8: 1c016f14 pcaddu12i $r20, 2936
144eec: 02dd6294 addi.d $r20, $r20, 1880
144ef0: 28c00285 ld.d $r5, $r20, 0
144ef4: 4c0000a1 jirl $ra, $r5, 0
144ef8: 28c06061 ld.d $ra, $sp, 24
144efc: 28c04076 ld.d $r22, $sp, 16
144f00: 02c08063 addi.d $sp, $sp, 32
144f04: 4c000020 jirl $zero, $ra, 0
144f08: 1c016e14 pcaddu12i $r20, 2928
144f0c: 02d1c294 addi.d $r20, $r20, 1136
144f10: 28c00284 ld.d $r4, $r20, 0
144f14: 4c000081 jirl $ra, $r4, 0
144f18: 002a0005 break 5
144f1c: 1c016be4 pcaddu12i $r4, 2911
144f20: 02fd9084 addi.d $r4, $r4, -156
144f24: 28c00084 ld.d $r4, $r4, 0
144f28: 4c000081 jirl $ra, $r4, 0
144f2c: 002a0005 break 5

After:

string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Handle: 0x06000053
Rid: 83
EntryPointRuntimeFunctionId: 76
Number of RuntimeFunctions: 1
Number of fixups: 1
TableIndex 5, Offset 06DB: System.Span`1<char> (TYPE_HANDLE)
string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Id: 76
StartAddress: 0x00144E80
Size: 176 bytes
UnwindRVA: 0x00011428
Debug Info
Bounds:
Native Offset: 0x0, Prolog, Source Types: StackEmpty
Native Offset: 0x18, IL Offset: 0x0000, Source Types: StackEmpty
Native Offset: 0x20, IL Offset: 0x000a, Source Types: StackEmpty
Native Offset: 0x24, IL Offset: 0x000e, Source Types: StackEmpty
Native Offset: 0x2C, IL Offset: 0x0012, Source Types: StackEmpty
Native Offset: 0x50, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x64, IL Offset: 0x002b, Source Types: StackEmpty
Native Offset: 0x78, Epilog, Source Types: StackEmpty
Native Offset: 0x88, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x9C, NoMapping, Source Types: StackEmpty
Variable Locations:
Variable Number: 0
Start Offset: 0x0
End Offset: 0x18
Loc Type: VLT_REG
Register: A0
Variable Number: 1
Start Offset: 0x1C
End Offset: 0x5C
Loc Type: VLT_REG
Register: T8
144e80: 02ff8063 addi.d $sp, $sp, -32
144e84: 29c04076 st.d $r22, $sp, 16
144e88: 29c06061 st.d $ra, $sp, 24
144e8c: 02c04076 addi.d $r22, $sp, 16
144e90: 29ffc2c0 st.d $zero, $r22, -16
144e94: 004080a5 slli.w $r5, $r5, 0
144e98: 004080b4 slli.w $r20, $r5, 0
144e9c: 50000800 b 0x144ea4
144ea0: 004080d4 slli.w $r20, $r6, 0
144ea4: 00408295 slli.w $r21, $r20, 0
144ea8: 64002815 bge $zero, $r21, 0x144ed0
144eac: 02bffe86 addi.w $r6, $r20, -1
144eb0: 004080d5 slli.w $r21, $r6, 0
144eb4: 6c006aa5 bgeu $r21, $r5, 0x144f1c
144eb8: 00df00c7 bstrpick.d $r7, $r6, 31, 0
144ebc: 004104e7 slli.d $r7, $r7, 1
144ec0: 38241c87 ldx.hu $r7, $r4, $r7
144ec4: 004080f5 slli.w $r21, $r7, 0
144ec8: 02808001 addi.w $ra, $zero, 32
144ecc: 67ffd435 bge $ra, $r21, 0x144ea0
144ed0: 00df0281 bstrpick.d $ra, $r20, 31, 0
144ed4: 00df00b5 bstrpick.d $r21, $r5, 31, 0
144ed8: 680032a1 bltu $r21, $ra, 0x144f08
144edc: 29ffc2c4 st.d $r4, $r22, -16
144ee0: 29bfe2d4 st.w $r20, $r22, -8
144ee4: 02ffc2c4 addi.d $r4, $r22, -16
A0 is dead
144ee8: 1c016f14 pcaddu12i $r20, 2936
144eec: 02dd6294 addi.d $r20, $r20, 1880
144ef0: 28c00285 ld.d $r5, $r20, 0
144ef4: 4c0000a1 jirl $ra, $r5, 0 // string System.Span`1<char>.ToString() (METHOD_ENTRY)
144ef8: 28c06061 ld.d $ra, $sp, 24
144efc: 28c04076 ld.d $r22, $sp, 16
144f00: 02c08063 addi.d $sp, $sp, 32
144f04: 4c000020 jirl $zero, $ra, 0
144f08: 1c016e14 pcaddu12i $r20, 2928
144f0c: 02d1c294 addi.d $r20, $r20, 1136
144f10: 28c00284 ld.d $r4, $r20, 0
144f14: 4c000081 jirl $ra, $r4, 0 // void System.ThrowHelper.ThrowArgumentOutOfRangeException() (METHOD_ENTRY_DEF_TOKEN)
144f18: 002a0005 break 5
144f1c: 1c016be4 pcaddu12i $r4, 2911
144f20: 02fd9084 addi.d $r4, $r4, -156
144f24: 28c00084 ld.d $r4, $r4, 0
144f28: 4c000081 jirl $ra, $r4, 0 // RNG_CHK_FAIL (HELPER)
144f2c: 002a0005 break 5

Comment threadsrc/coreclr/tools/r2rdump/CoreDisTools.cs Outdated
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

@shushanhf@jkotas Could you please review this PR? Thanks.

Comment threadsrc/coreclr/tools/r2rdump/CoreDisTools.cs Outdated
@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

Hi @shushanhf@jkotas@ivdiazsa
Could you please review this PR if you have time? Thanks.

@shushanhfshushanhf left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
thanks

@jkotas

Copy link
Copy Markdown
Member

Could you please resolve the conflicts?

@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

Could you please resolve the conflicts?

OK, I have resolved the conflicts.

Comment threadsrc/coreclr/tools/r2rdump/CoreDisTools.cs Outdated
@jkotas
jkotas merged commit af11dbc into dotnet:mainMay 18, 2024
@jkotas

Copy link
Copy Markdown
Member

Thanks!

@LuckyXu-HF
LuckyXu-HF deleted the main-LA64 branch May 18, 2024 06:02
Ruihan-Yin pushed a commit to Ruihan-Yin/runtime that referenced this pull request May 30, 2024
…102146)
* [LoongArch64] Add ProbeLoongArch64Quirks() for R2RDump tool.
* Update src/coreclr/tools/r2rdump/CoreDisTools.cs
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
---------
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jun 17, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

arch-loongarch64area-R2RDump-coreclrReady-to-run image dump toolcommunity-contributionIndicates that the PR has been added by a community member

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@LuckyXu-HF@jkotas@am11@shushanhf@SzpejnaDawid
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

[LoongArch64] Add ProbeLoongArch64Quirks() for R2RDump tool. - #102146

Merged
jkotas merged 5 commits into
dotnet:mainfrom
LuckyXu-HF:main-LA64
May 18, 2024
Merged

[LoongArch64] Add ProbeLoongArch64Quirks() for R2RDump tool.#102146
jkotas merged 5 commits into
dotnet:mainfrom
LuckyXu-HF:main-LA64

Conversation

@LuckyXu-HF

Copy link
Copy Markdown
Contributor

Add ProbeLoongArch64Quirks() for R2RDump to display the call method name and the branch address. This makes the r2rdump log more readable.

@ghostghost added the area-R2RDump-coreclr Ready-to-run image dump tool label May 13, 2024
@dotnet-policy-servicedotnet-policy-serviceBot added the community-contribution Indicates that the PR has been added by a community member label May 13, 2024
@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

This is mentioned by #101683 (comment)
@am11 , thanks again for your notification!

After implement ProbeLoongArch64Quirks(), the change is liking:
e.g: S.P.C.dll - PE32+ : string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Before:

string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Handle: 0x06000053
Rid: 83
EntryPointRuntimeFunctionId: 76
Number of RuntimeFunctions: 1
Number of fixups: 1
TableIndex 5, Offset 06DB: System.Span`1<char> (TYPE_HANDLE)
string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Id: 76
StartAddress: 0x00144E80
Size: 176 bytes
UnwindRVA: 0x00011428
Debug Info
Bounds:
Native Offset: 0x0, Prolog, Source Types: StackEmpty
Native Offset: 0x18, IL Offset: 0x0000, Source Types: StackEmpty
Native Offset: 0x20, IL Offset: 0x000a, Source Types: StackEmpty
Native Offset: 0x24, IL Offset: 0x000e, Source Types: StackEmpty
Native Offset: 0x2C, IL Offset: 0x0012, Source Types: StackEmpty
Native Offset: 0x50, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x64, IL Offset: 0x002b, Source Types: StackEmpty
Native Offset: 0x78, Epilog, Source Types: StackEmpty
Native Offset: 0x88, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x9C, NoMapping, Source Types: StackEmpty
Variable Locations:
Variable Number: 0
Start Offset: 0x0
End Offset: 0x18
Loc Type: VLT_REG
Register: A0
Variable Number: 1
Start Offset: 0x1C
End Offset: 0x5C
Loc Type: VLT_REG
Register: T8
144e80: 02ff8063 addi.d $sp, $sp, -32
144e84: 29c04076 st.d $r22, $sp, 16
144e88: 29c06061 st.d $ra, $sp, 24
144e8c: 02c04076 addi.d $r22, $sp, 16
144e90: 29ffc2c0 st.d $zero, $r22, -16
144e94: 004080a5 slli.w $r5, $r5, 0
144e98: 004080b4 slli.w $r20, $r5, 0
144e9c: 50000800 b 8
144ea0: 004080d4 slli.w $r20, $r6, 0
144ea4: 00408295 slli.w $r21, $r20, 0
144ea8: 64002815 bge $zero, $r21, 40
144eac: 02bffe86 addi.w $r6, $r20, -1
144eb0: 004080d5 slli.w $r21, $r6, 0
144eb4: 6c006aa5 bgeu $r21, $r5, 104
144eb8: 00df00c7 bstrpick.d $r7, $r6, 31, 0
144ebc: 004104e7 slli.d $r7, $r7, 1
144ec0: 38241c87 ldx.hu $r7, $r4, $r7
144ec4: 004080f5 slli.w $r21, $r7, 0
144ec8: 02808001 addi.w $ra, $zero, 32
144ecc: 67ffd435 bge $ra, $r21, -44
144ed0: 00df0281 bstrpick.d $ra, $r20, 31, 0
144ed4: 00df00b5 bstrpick.d $r21, $r5, 31, 0
144ed8: 680032a1 bltu $r21, $ra, 48
144edc: 29ffc2c4 st.d $r4, $r22, -16
144ee0: 29bfe2d4 st.w $r20, $r22, -8
144ee4: 02ffc2c4 addi.d $r4, $r22, -16
A0 is dead
144ee8: 1c016f14 pcaddu12i $r20, 2936
144eec: 02dd6294 addi.d $r20, $r20, 1880
144ef0: 28c00285 ld.d $r5, $r20, 0
144ef4: 4c0000a1 jirl $ra, $r5, 0
144ef8: 28c06061 ld.d $ra, $sp, 24
144efc: 28c04076 ld.d $r22, $sp, 16
144f00: 02c08063 addi.d $sp, $sp, 32
144f04: 4c000020 jirl $zero, $ra, 0
144f08: 1c016e14 pcaddu12i $r20, 2928
144f0c: 02d1c294 addi.d $r20, $r20, 1136
144f10: 28c00284 ld.d $r4, $r20, 0
144f14: 4c000081 jirl $ra, $r4, 0
144f18: 002a0005 break 5
144f1c: 1c016be4 pcaddu12i $r4, 2911
144f20: 02fd9084 addi.d $r4, $r4, -156
144f24: 28c00084 ld.d $r4, $r4, 0
144f28: 4c000081 jirl $ra, $r4, 0
144f2c: 002a0005 break 5

After:

string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Handle: 0x06000053
Rid: 83
EntryPointRuntimeFunctionId: 76
Number of RuntimeFunctions: 1
Number of fixups: 1
TableIndex 5, Offset 06DB: System.Span`1<char> (TYPE_HANDLE)
string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Id: 76
StartAddress: 0x00144E80
Size: 176 bytes
UnwindRVA: 0x00011428
Debug Info
Bounds:
Native Offset: 0x0, Prolog, Source Types: StackEmpty
Native Offset: 0x18, IL Offset: 0x0000, Source Types: StackEmpty
Native Offset: 0x20, IL Offset: 0x000a, Source Types: StackEmpty
Native Offset: 0x24, IL Offset: 0x000e, Source Types: StackEmpty
Native Offset: 0x2C, IL Offset: 0x0012, Source Types: StackEmpty
Native Offset: 0x50, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x64, IL Offset: 0x002b, Source Types: StackEmpty
Native Offset: 0x78, Epilog, Source Types: StackEmpty
Native Offset: 0x88, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x9C, NoMapping, Source Types: StackEmpty
Variable Locations:
Variable Number: 0
Start Offset: 0x0
End Offset: 0x18
Loc Type: VLT_REG
Register: A0
Variable Number: 1
Start Offset: 0x1C
End Offset: 0x5C
Loc Type: VLT_REG
Register: T8
144e80: 02ff8063 addi.d $sp, $sp, -32
144e84: 29c04076 st.d $r22, $sp, 16
144e88: 29c06061 st.d $ra, $sp, 24
144e8c: 02c04076 addi.d $r22, $sp, 16
144e90: 29ffc2c0 st.d $zero, $r22, -16
144e94: 004080a5 slli.w $r5, $r5, 0
144e98: 004080b4 slli.w $r20, $r5, 0
144e9c: 50000800 b 0x144ea4
144ea0: 004080d4 slli.w $r20, $r6, 0
144ea4: 00408295 slli.w $r21, $r20, 0
144ea8: 64002815 bge $zero, $r21, 0x144ed0
144eac: 02bffe86 addi.w $r6, $r20, -1
144eb0: 004080d5 slli.w $r21, $r6, 0
144eb4: 6c006aa5 bgeu $r21, $r5, 0x144f1c
144eb8: 00df00c7 bstrpick.d $r7, $r6, 31, 0
144ebc: 004104e7 slli.d $r7, $r7, 1
144ec0: 38241c87 ldx.hu $r7, $r4, $r7
144ec4: 004080f5 slli.w $r21, $r7, 0
144ec8: 02808001 addi.w $ra, $zero, 32
144ecc: 67ffd435 bge $ra, $r21, 0x144ea0
144ed0: 00df0281 bstrpick.d $ra, $r20, 31, 0
144ed4: 00df00b5 bstrpick.d $r21, $r5, 31, 0
144ed8: 680032a1 bltu $r21, $ra, 0x144f08
144edc: 29ffc2c4 st.d $r4, $r22, -16
144ee0: 29bfe2d4 st.w $r20, $r22, -8
144ee4: 02ffc2c4 addi.d $r4, $r22, -16
A0 is dead
144ee8: 1c016f14 pcaddu12i $r20, 2936
144eec: 02dd6294 addi.d $r20, $r20, 1880
144ef0: 28c00285 ld.d $r5, $r20, 0
144ef4: 4c0000a1 jirl $ra, $r5, 0 // string System.Span`1<char>.ToString() (METHOD_ENTRY)
144ef8: 28c06061 ld.d $ra, $sp, 24
144efc: 28c04076 ld.d $r22, $sp, 16
144f00: 02c08063 addi.d $sp, $sp, 32
144f04: 4c000020 jirl $zero, $ra, 0
144f08: 1c016e14 pcaddu12i $r20, 2928
144f0c: 02d1c294 addi.d $r20, $r20, 1136
144f10: 28c00284 ld.d $r4, $r20, 0
144f14: 4c000081 jirl $ra, $r4, 0 // void System.ThrowHelper.ThrowArgumentOutOfRangeException() (METHOD_ENTRY_DEF_TOKEN)
144f18: 002a0005 break 5
144f1c: 1c016be4 pcaddu12i $r4, 2911
144f20: 02fd9084 addi.d $r4, $r4, -156
144f24: 28c00084 ld.d $r4, $r4, 0
144f28: 4c000081 jirl $ra, $r4, 0 // RNG_CHK_FAIL (HELPER)
144f2c: 002a0005 break 5

Comment threadsrc/coreclr/tools/r2rdump/CoreDisTools.cs Outdated
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

@shushanhf@jkotas Could you please review this PR? Thanks.

Comment threadsrc/coreclr/tools/r2rdump/CoreDisTools.cs Outdated
@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

Hi @shushanhf@jkotas@ivdiazsa
Could you please review this PR if you have time? Thanks.

@shushanhfshushanhf left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
thanks

@jkotas

Copy link
Copy Markdown
Member

Could you please resolve the conflicts?

@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

Could you please resolve the conflicts?

OK, I have resolved the conflicts.

Comment threadsrc/coreclr/tools/r2rdump/CoreDisTools.cs Outdated
@jkotas
jkotas merged commit af11dbc into dotnet:mainMay 18, 2024
@jkotas

Copy link
Copy Markdown
Member

Thanks!

@LuckyXu-HF
LuckyXu-HF deleted the main-LA64 branch May 18, 2024 06:02
Ruihan-Yin pushed a commit to Ruihan-Yin/runtime that referenced this pull request May 30, 2024
…102146)
* [LoongArch64] Add ProbeLoongArch64Quirks() for R2RDump tool.
* Update src/coreclr/tools/r2rdump/CoreDisTools.cs
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
---------
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jun 17, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

arch-loongarch64area-R2RDump-coreclrReady-to-run image dump toolcommunity-contributionIndicates that the PR has been added by a community member

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@LuckyXu-HF@jkotas@am11@shushanhf@SzpejnaDawid
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[LoongArch64] Add ProbeLoongArch64Quirks() for R2RDump tool. - #102146

Merged
jkotas merged 5 commits into
dotnet:mainfrom
LuckyXu-HF:main-LA64
May 18, 2024
Merged

[LoongArch64] Add ProbeLoongArch64Quirks() for R2RDump tool.#102146
jkotas merged 5 commits into
dotnet:mainfrom
LuckyXu-HF:main-LA64

Conversation

@LuckyXu-HF

Copy link
Copy Markdown
Contributor

Add ProbeLoongArch64Quirks() for R2RDump to display the call method name and the branch address. This makes the r2rdump log more readable.

@ghostghost added the area-R2RDump-coreclr Ready-to-run image dump tool label May 13, 2024
@dotnet-policy-servicedotnet-policy-serviceBot added the community-contribution Indicates that the PR has been added by a community member label May 13, 2024
@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

This is mentioned by #101683 (comment)
@am11 , thanks again for your notification!

After implement ProbeLoongArch64Quirks(), the change is liking:
e.g: S.P.C.dll - PE32+ : string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Before:

string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Handle: 0x06000053
Rid: 83
EntryPointRuntimeFunctionId: 76
Number of RuntimeFunctions: 1
Number of fixups: 1
TableIndex 5, Offset 06DB: System.Span`1<char> (TYPE_HANDLE)
string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Id: 76
StartAddress: 0x00144E80
Size: 176 bytes
UnwindRVA: 0x00011428
Debug Info
Bounds:
Native Offset: 0x0, Prolog, Source Types: StackEmpty
Native Offset: 0x18, IL Offset: 0x0000, Source Types: StackEmpty
Native Offset: 0x20, IL Offset: 0x000a, Source Types: StackEmpty
Native Offset: 0x24, IL Offset: 0x000e, Source Types: StackEmpty
Native Offset: 0x2C, IL Offset: 0x0012, Source Types: StackEmpty
Native Offset: 0x50, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x64, IL Offset: 0x002b, Source Types: StackEmpty
Native Offset: 0x78, Epilog, Source Types: StackEmpty
Native Offset: 0x88, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x9C, NoMapping, Source Types: StackEmpty
Variable Locations:
Variable Number: 0
Start Offset: 0x0
End Offset: 0x18
Loc Type: VLT_REG
Register: A0
Variable Number: 1
Start Offset: 0x1C
End Offset: 0x5C
Loc Type: VLT_REG
Register: T8
144e80: 02ff8063 addi.d $sp, $sp, -32
144e84: 29c04076 st.d $r22, $sp, 16
144e88: 29c06061 st.d $ra, $sp, 24
144e8c: 02c04076 addi.d $r22, $sp, 16
144e90: 29ffc2c0 st.d $zero, $r22, -16
144e94: 004080a5 slli.w $r5, $r5, 0
144e98: 004080b4 slli.w $r20, $r5, 0
144e9c: 50000800 b 8
144ea0: 004080d4 slli.w $r20, $r6, 0
144ea4: 00408295 slli.w $r21, $r20, 0
144ea8: 64002815 bge $zero, $r21, 40
144eac: 02bffe86 addi.w $r6, $r20, -1
144eb0: 004080d5 slli.w $r21, $r6, 0
144eb4: 6c006aa5 bgeu $r21, $r5, 104
144eb8: 00df00c7 bstrpick.d $r7, $r6, 31, 0
144ebc: 004104e7 slli.d $r7, $r7, 1
144ec0: 38241c87 ldx.hu $r7, $r4, $r7
144ec4: 004080f5 slli.w $r21, $r7, 0
144ec8: 02808001 addi.w $ra, $zero, 32
144ecc: 67ffd435 bge $ra, $r21, -44
144ed0: 00df0281 bstrpick.d $ra, $r20, 31, 0
144ed4: 00df00b5 bstrpick.d $r21, $r5, 31, 0
144ed8: 680032a1 bltu $r21, $ra, 48
144edc: 29ffc2c4 st.d $r4, $r22, -16
144ee0: 29bfe2d4 st.w $r20, $r22, -8
144ee4: 02ffc2c4 addi.d $r4, $r22, -16
A0 is dead
144ee8: 1c016f14 pcaddu12i $r20, 2936
144eec: 02dd6294 addi.d $r20, $r20, 1880
144ef0: 28c00285 ld.d $r5, $r20, 0
144ef4: 4c0000a1 jirl $ra, $r5, 0
144ef8: 28c06061 ld.d $ra, $sp, 24
144efc: 28c04076 ld.d $r22, $sp, 16
144f00: 02c08063 addi.d $sp, $sp, 32
144f04: 4c000020 jirl $zero, $ra, 0
144f08: 1c016e14 pcaddu12i $r20, 2928
144f0c: 02d1c294 addi.d $r20, $r20, 1136
144f10: 28c00284 ld.d $r4, $r20, 0
144f14: 4c000081 jirl $ra, $r4, 0
144f18: 002a0005 break 5
144f1c: 1c016be4 pcaddu12i $r4, 2911
144f20: 02fd9084 addi.d $r4, $r4, -156
144f24: 28c00084 ld.d $r4, $r4, 0
144f28: 4c000081 jirl $ra, $r4, 0
144f2c: 002a0005 break 5

After:

string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Handle: 0x06000053
Rid: 83
EntryPointRuntimeFunctionId: 76
Number of RuntimeFunctions: 1
Number of fixups: 1
TableIndex 5, Offset 06DB: System.Span`1<char> (TYPE_HANDLE)
string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Id: 76
StartAddress: 0x00144E80
Size: 176 bytes
UnwindRVA: 0x00011428
Debug Info
Bounds:
Native Offset: 0x0, Prolog, Source Types: StackEmpty
Native Offset: 0x18, IL Offset: 0x0000, Source Types: StackEmpty
Native Offset: 0x20, IL Offset: 0x000a, Source Types: StackEmpty
Native Offset: 0x24, IL Offset: 0x000e, Source Types: StackEmpty
Native Offset: 0x2C, IL Offset: 0x0012, Source Types: StackEmpty
Native Offset: 0x50, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x64, IL Offset: 0x002b, Source Types: StackEmpty
Native Offset: 0x78, Epilog, Source Types: StackEmpty
Native Offset: 0x88, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x9C, NoMapping, Source Types: StackEmpty
Variable Locations:
Variable Number: 0
Start Offset: 0x0
End Offset: 0x18
Loc Type: VLT_REG
Register: A0
Variable Number: 1
Start Offset: 0x1C
End Offset: 0x5C
Loc Type: VLT_REG
Register: T8
144e80: 02ff8063 addi.d $sp, $sp, -32
144e84: 29c04076 st.d $r22, $sp, 16
144e88: 29c06061 st.d $ra, $sp, 24
144e8c: 02c04076 addi.d $r22, $sp, 16
144e90: 29ffc2c0 st.d $zero, $r22, -16
144e94: 004080a5 slli.w $r5, $r5, 0
144e98: 004080b4 slli.w $r20, $r5, 0
144e9c: 50000800 b 0x144ea4
144ea0: 004080d4 slli.w $r20, $r6, 0
144ea4: 00408295 slli.w $r21, $r20, 0
144ea8: 64002815 bge $zero, $r21, 0x144ed0
144eac: 02bffe86 addi.w $r6, $r20, -1
144eb0: 004080d5 slli.w $r21, $r6, 0
144eb4: 6c006aa5 bgeu $r21, $r5, 0x144f1c
144eb8: 00df00c7 bstrpick.d $r7, $r6, 31, 0
144ebc: 004104e7 slli.d $r7, $r7, 1
144ec0: 38241c87 ldx.hu $r7, $r4, $r7
144ec4: 004080f5 slli.w $r21, $r7, 0
144ec8: 02808001 addi.w $ra, $zero, 32
144ecc: 67ffd435 bge $ra, $r21, 0x144ea0
144ed0: 00df0281 bstrpick.d $ra, $r20, 31, 0
144ed4: 00df00b5 bstrpick.d $r21, $r5, 31, 0
144ed8: 680032a1 bltu $r21, $ra, 0x144f08
144edc: 29ffc2c4 st.d $r4, $r22, -16
144ee0: 29bfe2d4 st.w $r20, $r22, -8
144ee4: 02ffc2c4 addi.d $r4, $r22, -16
A0 is dead
144ee8: 1c016f14 pcaddu12i $r20, 2936
144eec: 02dd6294 addi.d $r20, $r20, 1880
144ef0: 28c00285 ld.d $r5, $r20, 0
144ef4: 4c0000a1 jirl $ra, $r5, 0 // string System.Span`1<char>.ToString() (METHOD_ENTRY)
144ef8: 28c06061 ld.d $ra, $sp, 24
144efc: 28c04076 ld.d $r22, $sp, 16
144f00: 02c08063 addi.d $sp, $sp, 32
144f04: 4c000020 jirl $zero, $ra, 0
144f08: 1c016e14 pcaddu12i $r20, 2928
144f0c: 02d1c294 addi.d $r20, $r20, 1136
144f10: 28c00284 ld.d $r4, $r20, 0
144f14: 4c000081 jirl $ra, $r4, 0 // void System.ThrowHelper.ThrowArgumentOutOfRangeException() (METHOD_ENTRY_DEF_TOKEN)
144f18: 002a0005 break 5
144f1c: 1c016be4 pcaddu12i $r4, 2911
144f20: 02fd9084 addi.d $r4, $r4, -156
144f24: 28c00084 ld.d $r4, $r4, 0
144f28: 4c000081 jirl $ra, $r4, 0 // RNG_CHK_FAIL (HELPER)
144f2c: 002a0005 break 5

Comment threadsrc/coreclr/tools/r2rdump/CoreDisTools.cs Outdated
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

@shushanhf@jkotas Could you please review this PR? Thanks.

Comment threadsrc/coreclr/tools/r2rdump/CoreDisTools.cs Outdated
@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

Hi @shushanhf@jkotas@ivdiazsa
Could you please review this PR if you have time? Thanks.

@shushanhfshushanhf left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
thanks

@jkotas

Copy link
Copy Markdown
Member

Could you please resolve the conflicts?

@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

Could you please resolve the conflicts?

OK, I have resolved the conflicts.

Comment threadsrc/coreclr/tools/r2rdump/CoreDisTools.cs Outdated
@jkotas
jkotas merged commit af11dbc into dotnet:mainMay 18, 2024
@jkotas

Copy link
Copy Markdown
Member

Thanks!

@LuckyXu-HF
LuckyXu-HF deleted the main-LA64 branch May 18, 2024 06:02
Ruihan-Yin pushed a commit to Ruihan-Yin/runtime that referenced this pull request May 30, 2024
…102146)
* [LoongArch64] Add ProbeLoongArch64Quirks() for R2RDump tool.
* Update src/coreclr/tools/r2rdump/CoreDisTools.cs
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
---------
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jun 17, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

arch-loongarch64area-R2RDump-coreclrReady-to-run image dump toolcommunity-contributionIndicates that the PR has been added by a community member

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@LuckyXu-HF@jkotas@am11@shushanhf@SzpejnaDawid
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[LoongArch64] Add ProbeLoongArch64Quirks() for R2RDump tool. - #102146

Merged
jkotas merged 5 commits into
dotnet:mainfrom
LuckyXu-HF:main-LA64
May 18, 2024
Merged

[LoongArch64] Add ProbeLoongArch64Quirks() for R2RDump tool.#102146
jkotas merged 5 commits into
dotnet:mainfrom
LuckyXu-HF:main-LA64

Conversation

@LuckyXu-HF

Copy link
Copy Markdown
Contributor

Add ProbeLoongArch64Quirks() for R2RDump to display the call method name and the branch address. This makes the r2rdump log more readable.

@ghostghost added the area-R2RDump-coreclr Ready-to-run image dump tool label May 13, 2024
@dotnet-policy-servicedotnet-policy-serviceBot added the community-contribution Indicates that the PR has been added by a community member label May 13, 2024
@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

This is mentioned by #101683 (comment)
@am11 , thanks again for your notification!

After implement ProbeLoongArch64Quirks(), the change is liking:
e.g: S.P.C.dll - PE32+ : string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Before:

string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Handle: 0x06000053
Rid: 83
EntryPointRuntimeFunctionId: 76
Number of RuntimeFunctions: 1
Number of fixups: 1
TableIndex 5, Offset 06DB: System.Span`1<char> (TYPE_HANDLE)
string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Id: 76
StartAddress: 0x00144E80
Size: 176 bytes
UnwindRVA: 0x00011428
Debug Info
Bounds:
Native Offset: 0x0, Prolog, Source Types: StackEmpty
Native Offset: 0x18, IL Offset: 0x0000, Source Types: StackEmpty
Native Offset: 0x20, IL Offset: 0x000a, Source Types: StackEmpty
Native Offset: 0x24, IL Offset: 0x000e, Source Types: StackEmpty
Native Offset: 0x2C, IL Offset: 0x0012, Source Types: StackEmpty
Native Offset: 0x50, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x64, IL Offset: 0x002b, Source Types: StackEmpty
Native Offset: 0x78, Epilog, Source Types: StackEmpty
Native Offset: 0x88, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x9C, NoMapping, Source Types: StackEmpty
Variable Locations:
Variable Number: 0
Start Offset: 0x0
End Offset: 0x18
Loc Type: VLT_REG
Register: A0
Variable Number: 1
Start Offset: 0x1C
End Offset: 0x5C
Loc Type: VLT_REG
Register: T8
144e80: 02ff8063 addi.d $sp, $sp, -32
144e84: 29c04076 st.d $r22, $sp, 16
144e88: 29c06061 st.d $ra, $sp, 24
144e8c: 02c04076 addi.d $r22, $sp, 16
144e90: 29ffc2c0 st.d $zero, $r22, -16
144e94: 004080a5 slli.w $r5, $r5, 0
144e98: 004080b4 slli.w $r20, $r5, 0
144e9c: 50000800 b 8
144ea0: 004080d4 slli.w $r20, $r6, 0
144ea4: 00408295 slli.w $r21, $r20, 0
144ea8: 64002815 bge $zero, $r21, 40
144eac: 02bffe86 addi.w $r6, $r20, -1
144eb0: 004080d5 slli.w $r21, $r6, 0
144eb4: 6c006aa5 bgeu $r21, $r5, 104
144eb8: 00df00c7 bstrpick.d $r7, $r6, 31, 0
144ebc: 004104e7 slli.d $r7, $r7, 1
144ec0: 38241c87 ldx.hu $r7, $r4, $r7
144ec4: 004080f5 slli.w $r21, $r7, 0
144ec8: 02808001 addi.w $ra, $zero, 32
144ecc: 67ffd435 bge $ra, $r21, -44
144ed0: 00df0281 bstrpick.d $ra, $r20, 31, 0
144ed4: 00df00b5 bstrpick.d $r21, $r5, 31, 0
144ed8: 680032a1 bltu $r21, $ra, 48
144edc: 29ffc2c4 st.d $r4, $r22, -16
144ee0: 29bfe2d4 st.w $r20, $r22, -8
144ee4: 02ffc2c4 addi.d $r4, $r22, -16
A0 is dead
144ee8: 1c016f14 pcaddu12i $r20, 2936
144eec: 02dd6294 addi.d $r20, $r20, 1880
144ef0: 28c00285 ld.d $r5, $r20, 0
144ef4: 4c0000a1 jirl $ra, $r5, 0
144ef8: 28c06061 ld.d $ra, $sp, 24
144efc: 28c04076 ld.d $r22, $sp, 16
144f00: 02c08063 addi.d $sp, $sp, 32
144f04: 4c000020 jirl $zero, $ra, 0
144f08: 1c016e14 pcaddu12i $r20, 2928
144f0c: 02d1c294 addi.d $r20, $r20, 1136
144f10: 28c00284 ld.d $r4, $r20, 0
144f14: 4c000081 jirl $ra, $r4, 0
144f18: 002a0005 break 5
144f1c: 1c016be4 pcaddu12i $r4, 2911
144f20: 02fd9084 addi.d $r4, $r4, -156
144f24: 28c00084 ld.d $r4, $r4, 0
144f28: 4c000081 jirl $ra, $r4, 0
144f2c: 002a0005 break 5

After:

string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Handle: 0x06000053
Rid: 83
EntryPointRuntimeFunctionId: 76
Number of RuntimeFunctions: 1
Number of fixups: 1
TableIndex 5, Offset 06DB: System.Span`1<char> (TYPE_HANDLE)
string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Id: 76
StartAddress: 0x00144E80
Size: 176 bytes
UnwindRVA: 0x00011428
Debug Info
Bounds:
Native Offset: 0x0, Prolog, Source Types: StackEmpty
Native Offset: 0x18, IL Offset: 0x0000, Source Types: StackEmpty
Native Offset: 0x20, IL Offset: 0x000a, Source Types: StackEmpty
Native Offset: 0x24, IL Offset: 0x000e, Source Types: StackEmpty
Native Offset: 0x2C, IL Offset: 0x0012, Source Types: StackEmpty
Native Offset: 0x50, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x64, IL Offset: 0x002b, Source Types: StackEmpty
Native Offset: 0x78, Epilog, Source Types: StackEmpty
Native Offset: 0x88, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x9C, NoMapping, Source Types: StackEmpty
Variable Locations:
Variable Number: 0
Start Offset: 0x0
End Offset: 0x18
Loc Type: VLT_REG
Register: A0
Variable Number: 1
Start Offset: 0x1C
End Offset: 0x5C
Loc Type: VLT_REG
Register: T8
144e80: 02ff8063 addi.d $sp, $sp, -32
144e84: 29c04076 st.d $r22, $sp, 16
144e88: 29c06061 st.d $ra, $sp, 24
144e8c: 02c04076 addi.d $r22, $sp, 16
144e90: 29ffc2c0 st.d $zero, $r22, -16
144e94: 004080a5 slli.w $r5, $r5, 0
144e98: 004080b4 slli.w $r20, $r5, 0
144e9c: 50000800 b 0x144ea4
144ea0: 004080d4 slli.w $r20, $r6, 0
144ea4: 00408295 slli.w $r21, $r20, 0
144ea8: 64002815 bge $zero, $r21, 0x144ed0
144eac: 02bffe86 addi.w $r6, $r20, -1
144eb0: 004080d5 slli.w $r21, $r6, 0
144eb4: 6c006aa5 bgeu $r21, $r5, 0x144f1c
144eb8: 00df00c7 bstrpick.d $r7, $r6, 31, 0
144ebc: 004104e7 slli.d $r7, $r7, 1
144ec0: 38241c87 ldx.hu $r7, $r4, $r7
144ec4: 004080f5 slli.w $r21, $r7, 0
144ec8: 02808001 addi.w $ra, $zero, 32
144ecc: 67ffd435 bge $ra, $r21, 0x144ea0
144ed0: 00df0281 bstrpick.d $ra, $r20, 31, 0
144ed4: 00df00b5 bstrpick.d $r21, $r5, 31, 0
144ed8: 680032a1 bltu $r21, $ra, 0x144f08
144edc: 29ffc2c4 st.d $r4, $r22, -16
144ee0: 29bfe2d4 st.w $r20, $r22, -8
144ee4: 02ffc2c4 addi.d $r4, $r22, -16
A0 is dead
144ee8: 1c016f14 pcaddu12i $r20, 2936
144eec: 02dd6294 addi.d $r20, $r20, 1880
144ef0: 28c00285 ld.d $r5, $r20, 0
144ef4: 4c0000a1 jirl $ra, $r5, 0 // string System.Span`1<char>.ToString() (METHOD_ENTRY)
144ef8: 28c06061 ld.d $ra, $sp, 24
144efc: 28c04076 ld.d $r22, $sp, 16
144f00: 02c08063 addi.d $sp, $sp, 32
144f04: 4c000020 jirl $zero, $ra, 0
144f08: 1c016e14 pcaddu12i $r20, 2928
144f0c: 02d1c294 addi.d $r20, $r20, 1136
144f10: 28c00284 ld.d $r4, $r20, 0
144f14: 4c000081 jirl $ra, $r4, 0 // void System.ThrowHelper.ThrowArgumentOutOfRangeException() (METHOD_ENTRY_DEF_TOKEN)
144f18: 002a0005 break 5
144f1c: 1c016be4 pcaddu12i $r4, 2911
144f20: 02fd9084 addi.d $r4, $r4, -156
144f24: 28c00084 ld.d $r4, $r4, 0
144f28: 4c000081 jirl $ra, $r4, 0 // RNG_CHK_FAIL (HELPER)
144f2c: 002a0005 break 5

Comment threadsrc/coreclr/tools/r2rdump/CoreDisTools.cs Outdated
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

@shushanhf@jkotas Could you please review this PR? Thanks.

Comment threadsrc/coreclr/tools/r2rdump/CoreDisTools.cs Outdated
@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

Hi @shushanhf@jkotas@ivdiazsa
Could you please review this PR if you have time? Thanks.

@shushanhfshushanhf left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
thanks

@jkotas

Copy link
Copy Markdown
Member

Could you please resolve the conflicts?

@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

Could you please resolve the conflicts?

OK, I have resolved the conflicts.

Comment threadsrc/coreclr/tools/r2rdump/CoreDisTools.cs Outdated
@jkotas
jkotas merged commit af11dbc into dotnet:mainMay 18, 2024
@jkotas

Copy link
Copy Markdown
Member

Thanks!

@LuckyXu-HF
LuckyXu-HF deleted the main-LA64 branch May 18, 2024 06:02
Ruihan-Yin pushed a commit to Ruihan-Yin/runtime that referenced this pull request May 30, 2024
…102146)
* [LoongArch64] Add ProbeLoongArch64Quirks() for R2RDump tool.
* Update src/coreclr/tools/r2rdump/CoreDisTools.cs
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
---------
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jun 17, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

arch-loongarch64area-R2RDump-coreclrReady-to-run image dump toolcommunity-contributionIndicates that the PR has been added by a community member

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@LuckyXu-HF@jkotas@am11@shushanhf@SzpejnaDawid
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

[LoongArch64] Add ProbeLoongArch64Quirks() for R2RDump tool. - #102146

Merged
jkotas merged 5 commits into
dotnet:mainfrom
LuckyXu-HF:main-LA64
May 18, 2024
Merged

[LoongArch64] Add ProbeLoongArch64Quirks() for R2RDump tool.#102146
jkotas merged 5 commits into
dotnet:mainfrom
LuckyXu-HF:main-LA64

Conversation

@LuckyXu-HF

Copy link
Copy Markdown
Contributor

Add ProbeLoongArch64Quirks() for R2RDump to display the call method name and the branch address. This makes the r2rdump log more readable.

@ghostghost added the area-R2RDump-coreclr Ready-to-run image dump tool label May 13, 2024
@dotnet-policy-servicedotnet-policy-serviceBot added the community-contribution Indicates that the PR has been added by a community member label May 13, 2024
@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

This is mentioned by #101683 (comment)
@am11 , thanks again for your notification!

After implement ProbeLoongArch64Quirks(), the change is liking:
e.g: S.P.C.dll - PE32+ : string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Before:

string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Handle: 0x06000053
Rid: 83
EntryPointRuntimeFunctionId: 76
Number of RuntimeFunctions: 1
Number of fixups: 1
TableIndex 5, Offset 06DB: System.Span`1<char> (TYPE_HANDLE)
string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Id: 76
StartAddress: 0x00144E80
Size: 176 bytes
UnwindRVA: 0x00011428
Debug Info
Bounds:
Native Offset: 0x0, Prolog, Source Types: StackEmpty
Native Offset: 0x18, IL Offset: 0x0000, Source Types: StackEmpty
Native Offset: 0x20, IL Offset: 0x000a, Source Types: StackEmpty
Native Offset: 0x24, IL Offset: 0x000e, Source Types: StackEmpty
Native Offset: 0x2C, IL Offset: 0x0012, Source Types: StackEmpty
Native Offset: 0x50, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x64, IL Offset: 0x002b, Source Types: StackEmpty
Native Offset: 0x78, Epilog, Source Types: StackEmpty
Native Offset: 0x88, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x9C, NoMapping, Source Types: StackEmpty
Variable Locations:
Variable Number: 0
Start Offset: 0x0
End Offset: 0x18
Loc Type: VLT_REG
Register: A0
Variable Number: 1
Start Offset: 0x1C
End Offset: 0x5C
Loc Type: VLT_REG
Register: T8
144e80: 02ff8063 addi.d $sp, $sp, -32
144e84: 29c04076 st.d $r22, $sp, 16
144e88: 29c06061 st.d $ra, $sp, 24
144e8c: 02c04076 addi.d $r22, $sp, 16
144e90: 29ffc2c0 st.d $zero, $r22, -16
144e94: 004080a5 slli.w $r5, $r5, 0
144e98: 004080b4 slli.w $r20, $r5, 0
144e9c: 50000800 b 8
144ea0: 004080d4 slli.w $r20, $r6, 0
144ea4: 00408295 slli.w $r21, $r20, 0
144ea8: 64002815 bge $zero, $r21, 40
144eac: 02bffe86 addi.w $r6, $r20, -1
144eb0: 004080d5 slli.w $r21, $r6, 0
144eb4: 6c006aa5 bgeu $r21, $r5, 104
144eb8: 00df00c7 bstrpick.d $r7, $r6, 31, 0
144ebc: 004104e7 slli.d $r7, $r7, 1
144ec0: 38241c87 ldx.hu $r7, $r4, $r7
144ec4: 004080f5 slli.w $r21, $r7, 0
144ec8: 02808001 addi.w $ra, $zero, 32
144ecc: 67ffd435 bge $ra, $r21, -44
144ed0: 00df0281 bstrpick.d $ra, $r20, 31, 0
144ed4: 00df00b5 bstrpick.d $r21, $r5, 31, 0
144ed8: 680032a1 bltu $r21, $ra, 48
144edc: 29ffc2c4 st.d $r4, $r22, -16
144ee0: 29bfe2d4 st.w $r20, $r22, -8
144ee4: 02ffc2c4 addi.d $r4, $r22, -16
A0 is dead
144ee8: 1c016f14 pcaddu12i $r20, 2936
144eec: 02dd6294 addi.d $r20, $r20, 1880
144ef0: 28c00285 ld.d $r5, $r20, 0
144ef4: 4c0000a1 jirl $ra, $r5, 0
144ef8: 28c06061 ld.d $ra, $sp, 24
144efc: 28c04076 ld.d $r22, $sp, 16
144f00: 02c08063 addi.d $sp, $sp, 32
144f04: 4c000020 jirl $zero, $ra, 0
144f08: 1c016e14 pcaddu12i $r20, 2928
144f0c: 02d1c294 addi.d $r20, $r20, 1136
144f10: 28c00284 ld.d $r4, $r20, 0
144f14: 4c000081 jirl $ra, $r4, 0
144f18: 002a0005 break 5
144f1c: 1c016be4 pcaddu12i $r4, 2911
144f20: 02fd9084 addi.d $r4, $r4, -156
144f24: 28c00084 ld.d $r4, $r4, 0
144f28: 4c000081 jirl $ra, $r4, 0
144f2c: 002a0005 break 5

After:

string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Handle: 0x06000053
Rid: 83
EntryPointRuntimeFunctionId: 76
Number of RuntimeFunctions: 1
Number of fixups: 1
TableIndex 5, Offset 06DB: System.Span`1<char> (TYPE_HANDLE)
string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Id: 76
StartAddress: 0x00144E80
Size: 176 bytes
UnwindRVA: 0x00011428
Debug Info
Bounds:
Native Offset: 0x0, Prolog, Source Types: StackEmpty
Native Offset: 0x18, IL Offset: 0x0000, Source Types: StackEmpty
Native Offset: 0x20, IL Offset: 0x000a, Source Types: StackEmpty
Native Offset: 0x24, IL Offset: 0x000e, Source Types: StackEmpty
Native Offset: 0x2C, IL Offset: 0x0012, Source Types: StackEmpty
Native Offset: 0x50, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x64, IL Offset: 0x002b, Source Types: StackEmpty
Native Offset: 0x78, Epilog, Source Types: StackEmpty
Native Offset: 0x88, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x9C, NoMapping, Source Types: StackEmpty
Variable Locations:
Variable Number: 0
Start Offset: 0x0
End Offset: 0x18
Loc Type: VLT_REG
Register: A0
Variable Number: 1
Start Offset: 0x1C
End Offset: 0x5C
Loc Type: VLT_REG
Register: T8
144e80: 02ff8063 addi.d $sp, $sp, -32
144e84: 29c04076 st.d $r22, $sp, 16
144e88: 29c06061 st.d $ra, $sp, 24
144e8c: 02c04076 addi.d $r22, $sp, 16
144e90: 29ffc2c0 st.d $zero, $r22, -16
144e94: 004080a5 slli.w $r5, $r5, 0
144e98: 004080b4 slli.w $r20, $r5, 0
144e9c: 50000800 b 0x144ea4
144ea0: 004080d4 slli.w $r20, $r6, 0
144ea4: 00408295 slli.w $r21, $r20, 0
144ea8: 64002815 bge $zero, $r21, 0x144ed0
144eac: 02bffe86 addi.w $r6, $r20, -1
144eb0: 004080d5 slli.w $r21, $r6, 0
144eb4: 6c006aa5 bgeu $r21, $r5, 0x144f1c
144eb8: 00df00c7 bstrpick.d $r7, $r6, 31, 0
144ebc: 004104e7 slli.d $r7, $r7, 1
144ec0: 38241c87 ldx.hu $r7, $r4, $r7
144ec4: 004080f5 slli.w $r21, $r7, 0
144ec8: 02808001 addi.w $ra, $zero, 32
144ecc: 67ffd435 bge $ra, $r21, 0x144ea0
144ed0: 00df0281 bstrpick.d $ra, $r20, 31, 0
144ed4: 00df00b5 bstrpick.d $r21, $r5, 31, 0
144ed8: 680032a1 bltu $r21, $ra, 0x144f08
144edc: 29ffc2c4 st.d $r4, $r22, -16
144ee0: 29bfe2d4 st.w $r20, $r22, -8
144ee4: 02ffc2c4 addi.d $r4, $r22, -16
A0 is dead
144ee8: 1c016f14 pcaddu12i $r20, 2936
144eec: 02dd6294 addi.d $r20, $r20, 1880
144ef0: 28c00285 ld.d $r5, $r20, 0
144ef4: 4c0000a1 jirl $ra, $r5, 0 // string System.Span`1<char>.ToString() (METHOD_ENTRY)
144ef8: 28c06061 ld.d $ra, $sp, 24
144efc: 28c04076 ld.d $r22, $sp, 16
144f00: 02c08063 addi.d $sp, $sp, 32
144f04: 4c000020 jirl $zero, $ra, 0
144f08: 1c016e14 pcaddu12i $r20, 2928
144f0c: 02d1c294 addi.d $r20, $r20, 1136
144f10: 28c00284 ld.d $r4, $r20, 0
144f14: 4c000081 jirl $ra, $r4, 0 // void System.ThrowHelper.ThrowArgumentOutOfRangeException() (METHOD_ENTRY_DEF_TOKEN)
144f18: 002a0005 break 5
144f1c: 1c016be4 pcaddu12i $r4, 2911
144f20: 02fd9084 addi.d $r4, $r4, -156
144f24: 28c00084 ld.d $r4, $r4, 0
144f28: 4c000081 jirl $ra, $r4, 0 // RNG_CHK_FAIL (HELPER)
144f2c: 002a0005 break 5

Comment threadsrc/coreclr/tools/r2rdump/CoreDisTools.cs Outdated
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

@shushanhf@jkotas Could you please review this PR? Thanks.

Comment threadsrc/coreclr/tools/r2rdump/CoreDisTools.cs Outdated
@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

Hi @shushanhf@jkotas@ivdiazsa
Could you please review this PR if you have time? Thanks.

@shushanhfshushanhf left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
thanks

@jkotas

Copy link
Copy Markdown
Member

Could you please resolve the conflicts?

@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

Could you please resolve the conflicts?

OK, I have resolved the conflicts.

Comment threadsrc/coreclr/tools/r2rdump/CoreDisTools.cs Outdated
@jkotas
jkotas merged commit af11dbc into dotnet:mainMay 18, 2024
@jkotas

Copy link
Copy Markdown
Member

Thanks!

@LuckyXu-HF
LuckyXu-HF deleted the main-LA64 branch May 18, 2024 06:02
Ruihan-Yin pushed a commit to Ruihan-Yin/runtime that referenced this pull request May 30, 2024
…102146)
* [LoongArch64] Add ProbeLoongArch64Quirks() for R2RDump tool.
* Update src/coreclr/tools/r2rdump/CoreDisTools.cs
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
---------
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jun 17, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

arch-loongarch64area-R2RDump-coreclrReady-to-run image dump toolcommunity-contributionIndicates that the PR has been added by a community member

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@LuckyXu-HF@jkotas@am11@shushanhf@SzpejnaDawid
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[LoongArch64] Add ProbeLoongArch64Quirks() for R2RDump tool. - #102146

Merged
jkotas merged 5 commits into
dotnet:mainfrom
LuckyXu-HF:main-LA64
May 18, 2024
Merged

[LoongArch64] Add ProbeLoongArch64Quirks() for R2RDump tool.#102146
jkotas merged 5 commits into
dotnet:mainfrom
LuckyXu-HF:main-LA64

Conversation

@LuckyXu-HF

Copy link
Copy Markdown
Contributor

Add ProbeLoongArch64Quirks() for R2RDump to display the call method name and the branch address. This makes the r2rdump log more readable.

@ghostghost added the area-R2RDump-coreclr Ready-to-run image dump tool label May 13, 2024
@dotnet-policy-servicedotnet-policy-serviceBot added the community-contribution Indicates that the PR has been added by a community member label May 13, 2024
@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

This is mentioned by #101683 (comment)
@am11 , thanks again for your notification!

After implement ProbeLoongArch64Quirks(), the change is liking:
e.g: S.P.C.dll - PE32+ : string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Before:

string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Handle: 0x06000053
Rid: 83
EntryPointRuntimeFunctionId: 76
Number of RuntimeFunctions: 1
Number of fixups: 1
TableIndex 5, Offset 06DB: System.Span`1<char> (TYPE_HANDLE)
string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Id: 76
StartAddress: 0x00144E80
Size: 176 bytes
UnwindRVA: 0x00011428
Debug Info
Bounds:
Native Offset: 0x0, Prolog, Source Types: StackEmpty
Native Offset: 0x18, IL Offset: 0x0000, Source Types: StackEmpty
Native Offset: 0x20, IL Offset: 0x000a, Source Types: StackEmpty
Native Offset: 0x24, IL Offset: 0x000e, Source Types: StackEmpty
Native Offset: 0x2C, IL Offset: 0x0012, Source Types: StackEmpty
Native Offset: 0x50, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x64, IL Offset: 0x002b, Source Types: StackEmpty
Native Offset: 0x78, Epilog, Source Types: StackEmpty
Native Offset: 0x88, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x9C, NoMapping, Source Types: StackEmpty
Variable Locations:
Variable Number: 0
Start Offset: 0x0
End Offset: 0x18
Loc Type: VLT_REG
Register: A0
Variable Number: 1
Start Offset: 0x1C
End Offset: 0x5C
Loc Type: VLT_REG
Register: T8
144e80: 02ff8063 addi.d $sp, $sp, -32
144e84: 29c04076 st.d $r22, $sp, 16
144e88: 29c06061 st.d $ra, $sp, 24
144e8c: 02c04076 addi.d $r22, $sp, 16
144e90: 29ffc2c0 st.d $zero, $r22, -16
144e94: 004080a5 slli.w $r5, $r5, 0
144e98: 004080b4 slli.w $r20, $r5, 0
144e9c: 50000800 b 8
144ea0: 004080d4 slli.w $r20, $r6, 0
144ea4: 00408295 slli.w $r21, $r20, 0
144ea8: 64002815 bge $zero, $r21, 40
144eac: 02bffe86 addi.w $r6, $r20, -1
144eb0: 004080d5 slli.w $r21, $r6, 0
144eb4: 6c006aa5 bgeu $r21, $r5, 104
144eb8: 00df00c7 bstrpick.d $r7, $r6, 31, 0
144ebc: 004104e7 slli.d $r7, $r7, 1
144ec0: 38241c87 ldx.hu $r7, $r4, $r7
144ec4: 004080f5 slli.w $r21, $r7, 0
144ec8: 02808001 addi.w $ra, $zero, 32
144ecc: 67ffd435 bge $ra, $r21, -44
144ed0: 00df0281 bstrpick.d $ra, $r20, 31, 0
144ed4: 00df00b5 bstrpick.d $r21, $r5, 31, 0
144ed8: 680032a1 bltu $r21, $ra, 48
144edc: 29ffc2c4 st.d $r4, $r22, -16
144ee0: 29bfe2d4 st.w $r20, $r22, -8
144ee4: 02ffc2c4 addi.d $r4, $r22, -16
A0 is dead
144ee8: 1c016f14 pcaddu12i $r20, 2936
144eec: 02dd6294 addi.d $r20, $r20, 1880
144ef0: 28c00285 ld.d $r5, $r20, 0
144ef4: 4c0000a1 jirl $ra, $r5, 0
144ef8: 28c06061 ld.d $ra, $sp, 24
144efc: 28c04076 ld.d $r22, $sp, 16
144f00: 02c08063 addi.d $sp, $sp, 32
144f04: 4c000020 jirl $zero, $ra, 0
144f08: 1c016e14 pcaddu12i $r20, 2928
144f0c: 02d1c294 addi.d $r20, $r20, 1136
144f10: 28c00284 ld.d $r4, $r20, 0
144f14: 4c000081 jirl $ra, $r4, 0
144f18: 002a0005 break 5
144f1c: 1c016be4 pcaddu12i $r4, 2911
144f20: 02fd9084 addi.d $r4, $r4, -156
144f24: 28c00084 ld.d $r4, $r4, 0
144f28: 4c000081 jirl $ra, $r4, 0
144f2c: 002a0005 break 5

After:

string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Handle: 0x06000053
Rid: 83
EntryPointRuntimeFunctionId: 76
Number of RuntimeFunctions: 1
Number of fixups: 1
TableIndex 5, Offset 06DB: System.Span`1<char> (TYPE_HANDLE)
string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Id: 76
StartAddress: 0x00144E80
Size: 176 bytes
UnwindRVA: 0x00011428
Debug Info
Bounds:
Native Offset: 0x0, Prolog, Source Types: StackEmpty
Native Offset: 0x18, IL Offset: 0x0000, Source Types: StackEmpty
Native Offset: 0x20, IL Offset: 0x000a, Source Types: StackEmpty
Native Offset: 0x24, IL Offset: 0x000e, Source Types: StackEmpty
Native Offset: 0x2C, IL Offset: 0x0012, Source Types: StackEmpty
Native Offset: 0x50, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x64, IL Offset: 0x002b, Source Types: StackEmpty
Native Offset: 0x78, Epilog, Source Types: StackEmpty
Native Offset: 0x88, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x9C, NoMapping, Source Types: StackEmpty
Variable Locations:
Variable Number: 0
Start Offset: 0x0
End Offset: 0x18
Loc Type: VLT_REG
Register: A0
Variable Number: 1
Start Offset: 0x1C
End Offset: 0x5C
Loc Type: VLT_REG
Register: T8
144e80: 02ff8063 addi.d $sp, $sp, -32
144e84: 29c04076 st.d $r22, $sp, 16
144e88: 29c06061 st.d $ra, $sp, 24
144e8c: 02c04076 addi.d $r22, $sp, 16
144e90: 29ffc2c0 st.d $zero, $r22, -16
144e94: 004080a5 slli.w $r5, $r5, 0
144e98: 004080b4 slli.w $r20, $r5, 0
144e9c: 50000800 b 0x144ea4
144ea0: 004080d4 slli.w $r20, $r6, 0
144ea4: 00408295 slli.w $r21, $r20, 0
144ea8: 64002815 bge $zero, $r21, 0x144ed0
144eac: 02bffe86 addi.w $r6, $r20, -1
144eb0: 004080d5 slli.w $r21, $r6, 0
144eb4: 6c006aa5 bgeu $r21, $r5, 0x144f1c
144eb8: 00df00c7 bstrpick.d $r7, $r6, 31, 0
144ebc: 004104e7 slli.d $r7, $r7, 1
144ec0: 38241c87 ldx.hu $r7, $r4, $r7
144ec4: 004080f5 slli.w $r21, $r7, 0
144ec8: 02808001 addi.w $ra, $zero, 32
144ecc: 67ffd435 bge $ra, $r21, 0x144ea0
144ed0: 00df0281 bstrpick.d $ra, $r20, 31, 0
144ed4: 00df00b5 bstrpick.d $r21, $r5, 31, 0
144ed8: 680032a1 bltu $r21, $ra, 0x144f08
144edc: 29ffc2c4 st.d $r4, $r22, -16
144ee0: 29bfe2d4 st.w $r20, $r22, -8
144ee4: 02ffc2c4 addi.d $r4, $r22, -16
A0 is dead
144ee8: 1c016f14 pcaddu12i $r20, 2936
144eec: 02dd6294 addi.d $r20, $r20, 1880
144ef0: 28c00285 ld.d $r5, $r20, 0
144ef4: 4c0000a1 jirl $ra, $r5, 0 // string System.Span`1<char>.ToString() (METHOD_ENTRY)
144ef8: 28c06061 ld.d $ra, $sp, 24
144efc: 28c04076 ld.d $r22, $sp, 16
144f00: 02c08063 addi.d $sp, $sp, 32
144f04: 4c000020 jirl $zero, $ra, 0
144f08: 1c016e14 pcaddu12i $r20, 2928
144f0c: 02d1c294 addi.d $r20, $r20, 1136
144f10: 28c00284 ld.d $r4, $r20, 0
144f14: 4c000081 jirl $ra, $r4, 0 // void System.ThrowHelper.ThrowArgumentOutOfRangeException() (METHOD_ENTRY_DEF_TOKEN)
144f18: 002a0005 break 5
144f1c: 1c016be4 pcaddu12i $r4, 2911
144f20: 02fd9084 addi.d $r4, $r4, -156
144f24: 28c00084 ld.d $r4, $r4, 0
144f28: 4c000081 jirl $ra, $r4, 0 // RNG_CHK_FAIL (HELPER)
144f2c: 002a0005 break 5

Comment threadsrc/coreclr/tools/r2rdump/CoreDisTools.cs Outdated
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

@shushanhf@jkotas Could you please review this PR? Thanks.

Comment threadsrc/coreclr/tools/r2rdump/CoreDisTools.cs Outdated
@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

Hi @shushanhf@jkotas@ivdiazsa
Could you please review this PR if you have time? Thanks.

@shushanhfshushanhf left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
thanks

@jkotas

Copy link
Copy Markdown
Member

Could you please resolve the conflicts?

@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

Could you please resolve the conflicts?

OK, I have resolved the conflicts.

Comment threadsrc/coreclr/tools/r2rdump/CoreDisTools.cs Outdated
@jkotas
jkotas merged commit af11dbc into dotnet:mainMay 18, 2024
@jkotas

Copy link
Copy Markdown
Member

Thanks!

@LuckyXu-HF
LuckyXu-HF deleted the main-LA64 branch May 18, 2024 06:02
Ruihan-Yin pushed a commit to Ruihan-Yin/runtime that referenced this pull request May 30, 2024
…102146)
* [LoongArch64] Add ProbeLoongArch64Quirks() for R2RDump tool.
* Update src/coreclr/tools/r2rdump/CoreDisTools.cs
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
---------
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jun 17, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

arch-loongarch64area-R2RDump-coreclrReady-to-run image dump toolcommunity-contributionIndicates that the PR has been added by a community member

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@LuckyXu-HF@jkotas@am11@shushanhf@SzpejnaDawid
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[LoongArch64] Add ProbeLoongArch64Quirks() for R2RDump tool. - #102146

Merged
jkotas merged 5 commits into
dotnet:mainfrom
LuckyXu-HF:main-LA64
May 18, 2024
Merged

[LoongArch64] Add ProbeLoongArch64Quirks() for R2RDump tool.#102146
jkotas merged 5 commits into
dotnet:mainfrom
LuckyXu-HF:main-LA64

Conversation

@LuckyXu-HF

Copy link
Copy Markdown
Contributor

Add ProbeLoongArch64Quirks() for R2RDump to display the call method name and the branch address. This makes the r2rdump log more readable.

@ghostghost added the area-R2RDump-coreclr Ready-to-run image dump tool label May 13, 2024
@dotnet-policy-servicedotnet-policy-serviceBot added the community-contribution Indicates that the PR has been added by a community member label May 13, 2024
@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

This is mentioned by #101683 (comment)
@am11 , thanks again for your notification!

After implement ProbeLoongArch64Quirks(), the change is liking:
e.g: S.P.C.dll - PE32+ : string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Before:

string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Handle: 0x06000053
Rid: 83
EntryPointRuntimeFunctionId: 76
Number of RuntimeFunctions: 1
Number of fixups: 1
TableIndex 5, Offset 06DB: System.Span`1<char> (TYPE_HANDLE)
string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Id: 76
StartAddress: 0x00144E80
Size: 176 bytes
UnwindRVA: 0x00011428
Debug Info
Bounds:
Native Offset: 0x0, Prolog, Source Types: StackEmpty
Native Offset: 0x18, IL Offset: 0x0000, Source Types: StackEmpty
Native Offset: 0x20, IL Offset: 0x000a, Source Types: StackEmpty
Native Offset: 0x24, IL Offset: 0x000e, Source Types: StackEmpty
Native Offset: 0x2C, IL Offset: 0x0012, Source Types: StackEmpty
Native Offset: 0x50, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x64, IL Offset: 0x002b, Source Types: StackEmpty
Native Offset: 0x78, Epilog, Source Types: StackEmpty
Native Offset: 0x88, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x9C, NoMapping, Source Types: StackEmpty
Variable Locations:
Variable Number: 0
Start Offset: 0x0
End Offset: 0x18
Loc Type: VLT_REG
Register: A0
Variable Number: 1
Start Offset: 0x1C
End Offset: 0x5C
Loc Type: VLT_REG
Register: T8
144e80: 02ff8063 addi.d $sp, $sp, -32
144e84: 29c04076 st.d $r22, $sp, 16
144e88: 29c06061 st.d $ra, $sp, 24
144e8c: 02c04076 addi.d $r22, $sp, 16
144e90: 29ffc2c0 st.d $zero, $r22, -16
144e94: 004080a5 slli.w $r5, $r5, 0
144e98: 004080b4 slli.w $r20, $r5, 0
144e9c: 50000800 b 8
144ea0: 004080d4 slli.w $r20, $r6, 0
144ea4: 00408295 slli.w $r21, $r20, 0
144ea8: 64002815 bge $zero, $r21, 40
144eac: 02bffe86 addi.w $r6, $r20, -1
144eb0: 004080d5 slli.w $r21, $r6, 0
144eb4: 6c006aa5 bgeu $r21, $r5, 104
144eb8: 00df00c7 bstrpick.d $r7, $r6, 31, 0
144ebc: 004104e7 slli.d $r7, $r7, 1
144ec0: 38241c87 ldx.hu $r7, $r4, $r7
144ec4: 004080f5 slli.w $r21, $r7, 0
144ec8: 02808001 addi.w $ra, $zero, 32
144ecc: 67ffd435 bge $ra, $r21, -44
144ed0: 00df0281 bstrpick.d $ra, $r20, 31, 0
144ed4: 00df00b5 bstrpick.d $r21, $r5, 31, 0
144ed8: 680032a1 bltu $r21, $ra, 48
144edc: 29ffc2c4 st.d $r4, $r22, -16
144ee0: 29bfe2d4 st.w $r20, $r22, -8
144ee4: 02ffc2c4 addi.d $r4, $r22, -16
A0 is dead
144ee8: 1c016f14 pcaddu12i $r20, 2936
144eec: 02dd6294 addi.d $r20, $r20, 1880
144ef0: 28c00285 ld.d $r5, $r20, 0
144ef4: 4c0000a1 jirl $ra, $r5, 0
144ef8: 28c06061 ld.d $ra, $sp, 24
144efc: 28c04076 ld.d $r22, $sp, 16
144f00: 02c08063 addi.d $sp, $sp, 32
144f04: 4c000020 jirl $zero, $ra, 0
144f08: 1c016e14 pcaddu12i $r20, 2928
144f0c: 02d1c294 addi.d $r20, $r20, 1136
144f10: 28c00284 ld.d $r4, $r20, 0
144f14: 4c000081 jirl $ra, $r4, 0
144f18: 002a0005 break 5
144f1c: 1c016be4 pcaddu12i $r4, 2911
144f20: 02fd9084 addi.d $r4, $r4, -156
144f24: 28c00084 ld.d $r4, $r4, 0
144f28: 4c000081 jirl $ra, $r4, 0
144f2c: 002a0005 break 5

After:

string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Handle: 0x06000053
Rid: 83
EntryPointRuntimeFunctionId: 76
Number of RuntimeFunctions: 1
Number of fixups: 1
TableIndex 5, Offset 06DB: System.Span`1<char> (TYPE_HANDLE)
string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Id: 76
StartAddress: 0x00144E80
Size: 176 bytes
UnwindRVA: 0x00011428
Debug Info
Bounds:
Native Offset: 0x0, Prolog, Source Types: StackEmpty
Native Offset: 0x18, IL Offset: 0x0000, Source Types: StackEmpty
Native Offset: 0x20, IL Offset: 0x000a, Source Types: StackEmpty
Native Offset: 0x24, IL Offset: 0x000e, Source Types: StackEmpty
Native Offset: 0x2C, IL Offset: 0x0012, Source Types: StackEmpty
Native Offset: 0x50, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x64, IL Offset: 0x002b, Source Types: StackEmpty
Native Offset: 0x78, Epilog, Source Types: StackEmpty
Native Offset: 0x88, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x9C, NoMapping, Source Types: StackEmpty
Variable Locations:
Variable Number: 0
Start Offset: 0x0
End Offset: 0x18
Loc Type: VLT_REG
Register: A0
Variable Number: 1
Start Offset: 0x1C
End Offset: 0x5C
Loc Type: VLT_REG
Register: T8
144e80: 02ff8063 addi.d $sp, $sp, -32
144e84: 29c04076 st.d $r22, $sp, 16
144e88: 29c06061 st.d $ra, $sp, 24
144e8c: 02c04076 addi.d $r22, $sp, 16
144e90: 29ffc2c0 st.d $zero, $r22, -16
144e94: 004080a5 slli.w $r5, $r5, 0
144e98: 004080b4 slli.w $r20, $r5, 0
144e9c: 50000800 b 0x144ea4
144ea0: 004080d4 slli.w $r20, $r6, 0
144ea4: 00408295 slli.w $r21, $r20, 0
144ea8: 64002815 bge $zero, $r21, 0x144ed0
144eac: 02bffe86 addi.w $r6, $r20, -1
144eb0: 004080d5 slli.w $r21, $r6, 0
144eb4: 6c006aa5 bgeu $r21, $r5, 0x144f1c
144eb8: 00df00c7 bstrpick.d $r7, $r6, 31, 0
144ebc: 004104e7 slli.d $r7, $r7, 1
144ec0: 38241c87 ldx.hu $r7, $r4, $r7
144ec4: 004080f5 slli.w $r21, $r7, 0
144ec8: 02808001 addi.w $ra, $zero, 32
144ecc: 67ffd435 bge $ra, $r21, 0x144ea0
144ed0: 00df0281 bstrpick.d $ra, $r20, 31, 0
144ed4: 00df00b5 bstrpick.d $r21, $r5, 31, 0
144ed8: 680032a1 bltu $r21, $ra, 0x144f08
144edc: 29ffc2c4 st.d $r4, $r22, -16
144ee0: 29bfe2d4 st.w $r20, $r22, -8
144ee4: 02ffc2c4 addi.d $r4, $r22, -16
A0 is dead
144ee8: 1c016f14 pcaddu12i $r20, 2936
144eec: 02dd6294 addi.d $r20, $r20, 1880
144ef0: 28c00285 ld.d $r5, $r20, 0
144ef4: 4c0000a1 jirl $ra, $r5, 0 // string System.Span`1<char>.ToString() (METHOD_ENTRY)
144ef8: 28c06061 ld.d $ra, $sp, 24
144efc: 28c04076 ld.d $r22, $sp, 16
144f00: 02c08063 addi.d $sp, $sp, 32
144f04: 4c000020 jirl $zero, $ra, 0
144f08: 1c016e14 pcaddu12i $r20, 2928
144f0c: 02d1c294 addi.d $r20, $r20, 1136
144f10: 28c00284 ld.d $r4, $r20, 0
144f14: 4c000081 jirl $ra, $r4, 0 // void System.ThrowHelper.ThrowArgumentOutOfRangeException() (METHOD_ENTRY_DEF_TOKEN)
144f18: 002a0005 break 5
144f1c: 1c016be4 pcaddu12i $r4, 2911
144f20: 02fd9084 addi.d $r4, $r4, -156
144f24: 28c00084 ld.d $r4, $r4, 0
144f28: 4c000081 jirl $ra, $r4, 0 // RNG_CHK_FAIL (HELPER)
144f2c: 002a0005 break 5

Comment threadsrc/coreclr/tools/r2rdump/CoreDisTools.cs Outdated
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

@shushanhf@jkotas Could you please review this PR? Thanks.

Comment threadsrc/coreclr/tools/r2rdump/CoreDisTools.cs Outdated
@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

Hi @shushanhf@jkotas@ivdiazsa
Could you please review this PR if you have time? Thanks.

@shushanhfshushanhf left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
thanks

@jkotas

Copy link
Copy Markdown
Member

Could you please resolve the conflicts?

@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

Could you please resolve the conflicts?

OK, I have resolved the conflicts.

Comment threadsrc/coreclr/tools/r2rdump/CoreDisTools.cs Outdated
@jkotas
jkotas merged commit af11dbc into dotnet:mainMay 18, 2024
@jkotas

Copy link
Copy Markdown
Member

Thanks!

@LuckyXu-HF
LuckyXu-HF deleted the main-LA64 branch May 18, 2024 06:02
Ruihan-Yin pushed a commit to Ruihan-Yin/runtime that referenced this pull request May 30, 2024
…102146)
* [LoongArch64] Add ProbeLoongArch64Quirks() for R2RDump tool.
* Update src/coreclr/tools/r2rdump/CoreDisTools.cs
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
---------
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jun 17, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

arch-loongarch64area-R2RDump-coreclrReady-to-run image dump toolcommunity-contributionIndicates that the PR has been added by a community member

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@LuckyXu-HF@jkotas@am11@shushanhf@SzpejnaDawid
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

[LoongArch64] Add ProbeLoongArch64Quirks() for R2RDump tool. - #102146

Merged
jkotas merged 5 commits into
dotnet:mainfrom
LuckyXu-HF:main-LA64
May 18, 2024
Merged

[LoongArch64] Add ProbeLoongArch64Quirks() for R2RDump tool.#102146
jkotas merged 5 commits into
dotnet:mainfrom
LuckyXu-HF:main-LA64

Conversation

@LuckyXu-HF

Copy link
Copy Markdown
Contributor

Add ProbeLoongArch64Quirks() for R2RDump to display the call method name and the branch address. This makes the r2rdump log more readable.

@ghostghost added the area-R2RDump-coreclr Ready-to-run image dump tool label May 13, 2024
@dotnet-policy-servicedotnet-policy-serviceBot added the community-contribution Indicates that the PR has been added by a community member label May 13, 2024
@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

This is mentioned by #101683 (comment)
@am11 , thanks again for your notification!

After implement ProbeLoongArch64Quirks(), the change is liking:
e.g: S.P.C.dll - PE32+ : string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Before:

string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Handle: 0x06000053
Rid: 83
EntryPointRuntimeFunctionId: 76
Number of RuntimeFunctions: 1
Number of fixups: 1
TableIndex 5, Offset 06DB: System.Span`1<char> (TYPE_HANDLE)
string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Id: 76
StartAddress: 0x00144E80
Size: 176 bytes
UnwindRVA: 0x00011428
Debug Info
Bounds:
Native Offset: 0x0, Prolog, Source Types: StackEmpty
Native Offset: 0x18, IL Offset: 0x0000, Source Types: StackEmpty
Native Offset: 0x20, IL Offset: 0x000a, Source Types: StackEmpty
Native Offset: 0x24, IL Offset: 0x000e, Source Types: StackEmpty
Native Offset: 0x2C, IL Offset: 0x0012, Source Types: StackEmpty
Native Offset: 0x50, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x64, IL Offset: 0x002b, Source Types: StackEmpty
Native Offset: 0x78, Epilog, Source Types: StackEmpty
Native Offset: 0x88, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x9C, NoMapping, Source Types: StackEmpty
Variable Locations:
Variable Number: 0
Start Offset: 0x0
End Offset: 0x18
Loc Type: VLT_REG
Register: A0
Variable Number: 1
Start Offset: 0x1C
End Offset: 0x5C
Loc Type: VLT_REG
Register: T8
144e80: 02ff8063 addi.d $sp, $sp, -32
144e84: 29c04076 st.d $r22, $sp, 16
144e88: 29c06061 st.d $ra, $sp, 24
144e8c: 02c04076 addi.d $r22, $sp, 16
144e90: 29ffc2c0 st.d $zero, $r22, -16
144e94: 004080a5 slli.w $r5, $r5, 0
144e98: 004080b4 slli.w $r20, $r5, 0
144e9c: 50000800 b 8
144ea0: 004080d4 slli.w $r20, $r6, 0
144ea4: 00408295 slli.w $r21, $r20, 0
144ea8: 64002815 bge $zero, $r21, 40
144eac: 02bffe86 addi.w $r6, $r20, -1
144eb0: 004080d5 slli.w $r21, $r6, 0
144eb4: 6c006aa5 bgeu $r21, $r5, 104
144eb8: 00df00c7 bstrpick.d $r7, $r6, 31, 0
144ebc: 004104e7 slli.d $r7, $r7, 1
144ec0: 38241c87 ldx.hu $r7, $r4, $r7
144ec4: 004080f5 slli.w $r21, $r7, 0
144ec8: 02808001 addi.w $ra, $zero, 32
144ecc: 67ffd435 bge $ra, $r21, -44
144ed0: 00df0281 bstrpick.d $ra, $r20, 31, 0
144ed4: 00df00b5 bstrpick.d $r21, $r5, 31, 0
144ed8: 680032a1 bltu $r21, $ra, 48
144edc: 29ffc2c4 st.d $r4, $r22, -16
144ee0: 29bfe2d4 st.w $r20, $r22, -8
144ee4: 02ffc2c4 addi.d $r4, $r22, -16
A0 is dead
144ee8: 1c016f14 pcaddu12i $r20, 2936
144eec: 02dd6294 addi.d $r20, $r20, 1880
144ef0: 28c00285 ld.d $r5, $r20, 0
144ef4: 4c0000a1 jirl $ra, $r5, 0
144ef8: 28c06061 ld.d $ra, $sp, 24
144efc: 28c04076 ld.d $r22, $sp, 16
144f00: 02c08063 addi.d $sp, $sp, 32
144f04: 4c000020 jirl $zero, $ra, 0
144f08: 1c016e14 pcaddu12i $r20, 2928
144f0c: 02d1c294 addi.d $r20, $r20, 1136
144f10: 28c00284 ld.d $r4, $r20, 0
144f14: 4c000081 jirl $ra, $r4, 0
144f18: 002a0005 break 5
144f1c: 1c016be4 pcaddu12i $r4, 2911
144f20: 02fd9084 addi.d $r4, $r4, -156
144f24: 28c00084 ld.d $r4, $r4, 0
144f28: 4c000081 jirl $ra, $r4, 0
144f2c: 002a0005 break 5

After:

string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Handle: 0x06000053
Rid: 83
EntryPointRuntimeFunctionId: 76
Number of RuntimeFunctions: 1
Number of fixups: 1
TableIndex 5, Offset 06DB: System.Span`1<char> (TYPE_HANDLE)
string Interop+Kernel32.GetAndTrimString(System.Span`1<char>)
Id: 76
StartAddress: 0x00144E80
Size: 176 bytes
UnwindRVA: 0x00011428
Debug Info
Bounds:
Native Offset: 0x0, Prolog, Source Types: StackEmpty
Native Offset: 0x18, IL Offset: 0x0000, Source Types: StackEmpty
Native Offset: 0x20, IL Offset: 0x000a, Source Types: StackEmpty
Native Offset: 0x24, IL Offset: 0x000e, Source Types: StackEmpty
Native Offset: 0x2C, IL Offset: 0x0012, Source Types: StackEmpty
Native Offset: 0x50, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x64, IL Offset: 0x002b, Source Types: StackEmpty
Native Offset: 0x78, Epilog, Source Types: StackEmpty
Native Offset: 0x88, IL Offset: 0x0021, Source Types: StackEmpty
Native Offset: 0x9C, NoMapping, Source Types: StackEmpty
Variable Locations:
Variable Number: 0
Start Offset: 0x0
End Offset: 0x18
Loc Type: VLT_REG
Register: A0
Variable Number: 1
Start Offset: 0x1C
End Offset: 0x5C
Loc Type: VLT_REG
Register: T8
144e80: 02ff8063 addi.d $sp, $sp, -32
144e84: 29c04076 st.d $r22, $sp, 16
144e88: 29c06061 st.d $ra, $sp, 24
144e8c: 02c04076 addi.d $r22, $sp, 16
144e90: 29ffc2c0 st.d $zero, $r22, -16
144e94: 004080a5 slli.w $r5, $r5, 0
144e98: 004080b4 slli.w $r20, $r5, 0
144e9c: 50000800 b 0x144ea4
144ea0: 004080d4 slli.w $r20, $r6, 0
144ea4: 00408295 slli.w $r21, $r20, 0
144ea8: 64002815 bge $zero, $r21, 0x144ed0
144eac: 02bffe86 addi.w $r6, $r20, -1
144eb0: 004080d5 slli.w $r21, $r6, 0
144eb4: 6c006aa5 bgeu $r21, $r5, 0x144f1c
144eb8: 00df00c7 bstrpick.d $r7, $r6, 31, 0
144ebc: 004104e7 slli.d $r7, $r7, 1
144ec0: 38241c87 ldx.hu $r7, $r4, $r7
144ec4: 004080f5 slli.w $r21, $r7, 0
144ec8: 02808001 addi.w $ra, $zero, 32
144ecc: 67ffd435 bge $ra, $r21, 0x144ea0
144ed0: 00df0281 bstrpick.d $ra, $r20, 31, 0
144ed4: 00df00b5 bstrpick.d $r21, $r5, 31, 0
144ed8: 680032a1 bltu $r21, $ra, 0x144f08
144edc: 29ffc2c4 st.d $r4, $r22, -16
144ee0: 29bfe2d4 st.w $r20, $r22, -8
144ee4: 02ffc2c4 addi.d $r4, $r22, -16
A0 is dead
144ee8: 1c016f14 pcaddu12i $r20, 2936
144eec: 02dd6294 addi.d $r20, $r20, 1880
144ef0: 28c00285 ld.d $r5, $r20, 0
144ef4: 4c0000a1 jirl $ra, $r5, 0 // string System.Span`1<char>.ToString() (METHOD_ENTRY)
144ef8: 28c06061 ld.d $ra, $sp, 24
144efc: 28c04076 ld.d $r22, $sp, 16
144f00: 02c08063 addi.d $sp, $sp, 32
144f04: 4c000020 jirl $zero, $ra, 0
144f08: 1c016e14 pcaddu12i $r20, 2928
144f0c: 02d1c294 addi.d $r20, $r20, 1136
144f10: 28c00284 ld.d $r4, $r20, 0
144f14: 4c000081 jirl $ra, $r4, 0 // void System.ThrowHelper.ThrowArgumentOutOfRangeException() (METHOD_ENTRY_DEF_TOKEN)
144f18: 002a0005 break 5
144f1c: 1c016be4 pcaddu12i $r4, 2911
144f20: 02fd9084 addi.d $r4, $r4, -156
144f24: 28c00084 ld.d $r4, $r4, 0
144f28: 4c000081 jirl $ra, $r4, 0 // RNG_CHK_FAIL (HELPER)
144f2c: 002a0005 break 5

Comment threadsrc/coreclr/tools/r2rdump/CoreDisTools.cs Outdated
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

@shushanhf@jkotas Could you please review this PR? Thanks.

Comment threadsrc/coreclr/tools/r2rdump/CoreDisTools.cs Outdated
@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

Hi @shushanhf@jkotas@ivdiazsa
Could you please review this PR if you have time? Thanks.

@shushanhfshushanhf left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
thanks

@jkotas

Copy link
Copy Markdown
Member

Could you please resolve the conflicts?

@LuckyXu-HF

Copy link
Copy Markdown
ContributorAuthor

Could you please resolve the conflicts?

OK, I have resolved the conflicts.

Comment threadsrc/coreclr/tools/r2rdump/CoreDisTools.cs Outdated
@jkotas
jkotas merged commit af11dbc into dotnet:mainMay 18, 2024
@jkotas

Copy link
Copy Markdown
Member

Thanks!

@LuckyXu-HF
LuckyXu-HF deleted the main-LA64 branch May 18, 2024 06:02
Ruihan-Yin pushed a commit to Ruihan-Yin/runtime that referenced this pull request May 30, 2024
…102146)
* [LoongArch64] Add ProbeLoongArch64Quirks() for R2RDump tool.
* Update src/coreclr/tools/r2rdump/CoreDisTools.cs
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
---------
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Jun 17, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

arch-loongarch64area-R2RDump-coreclrReady-to-run image dump toolcommunity-contributionIndicates that the PR has been added by a community member

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@LuckyXu-HF@jkotas@am11@shushanhf@SzpejnaDawid