fix MemToShadow_DG2

AllanZyne · AllanZyne · commit 73304bb1d5f7 · 2024-07-04T03:28:22.000-07:00
diff --git a/source/loader/layers/sanitizer/asan_interceptor.cpp b/source/loader/layers/sanitizer/asan_interceptor.cpp
@@ -29,10 +29,10 @@ uptr MemToShadow_CPU(uptr USM_SHADOW_BASE, uptr UPtr) {
 
 uptr MemToShadow_DG2(uptr USM_SHADOW_BASE, uptr UPtr) {
     if (UPtr & 0xFFFF000000000000ULL) { // Device USM
-        return USM_SHADOW_BASE + 0x100000000000ULL +
-               ((UPtr & 0x7FFFFFFFFFFFULL) >> 3);
+        return USM_SHADOW_BASE + 0x80000000000ULL +
+               ((UPtr & 0x7FFFFFFFFFFFULL) >> ASAN_SHADOW_SCALE);
     } else { // Host/Shared USM
-        return USM_SHADOW_BASE + (UPtr >> 3);
+        return USM_SHADOW_BASE + (UPtr >> ASAN_SHADOW_SCALE);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,10 @@ uptr MemToShadow_CPU(uptr USM_SHADOW_BASE, uptr UPtr) {`
`29`	`29`
`30`	`30`	`uptr MemToShadow_DG2(uptr USM_SHADOW_BASE, uptr UPtr) {`
`31`	`31`	`if (UPtr & 0xFFFF000000000000ULL) { // Device USM`
`32`		`- return USM_SHADOW_BASE + 0x100000000000ULL +`
`33`		`- ((UPtr & 0x7FFFFFFFFFFFULL) >> 3);`
	`32`	`+ return USM_SHADOW_BASE + 0x80000000000ULL +`
	`33`	`+ ((UPtr & 0x7FFFFFFFFFFFULL) >> ASAN_SHADOW_SCALE);`
`34`	`34`	`} else { // Host/Shared USM`
`35`		`- return USM_SHADOW_BASE + (UPtr >> 3);`
	`35`	`+ return USM_SHADOW_BASE + (UPtr >> ASAN_SHADOW_SCALE);`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`