Port PR #18247 from 3.0

hoyosjs · hoyosjs · commit de90cbd4dd08 · 2018-08-24T01:28:50.000-07:00
diff --git a/src/debug/ee/debugger.h b/src/debug/ee/debugger.h
@@ -1324,7 +1324,7 @@ class CodeRegionInfo
     {
         LIMITED_METHOD_CONTRACT;
 
-        PCODE address = (PCODE)addr;
+        PCODE address = PINSTRToPCODE((TADDR)addr);
 
         if ((address >= m_addrOfHotCode) &&
             (address <  m_addrOfHotCode + m_sizeOfHotCode))
@@ -1346,7 +1346,7 @@ class CodeRegionInfo
     {
         LIMITED_METHOD_CONTRACT;
 
-        PCODE address = (PCODE)addr;
+        PCODE address = PINSTRToPCODE((TADDR)addr);
         return (((address >= m_addrOfHotCode) &&
                  (address <  m_addrOfHotCode + m_sizeOfHotCode)) ||
                 ((address >= m_addrOfColdCode) &&

Original file line number	Diff line number	Diff line change
`@@ -1324,7 +1324,7 @@ class CodeRegionInfo`
`1324`	`1324`	`{`
`1325`	`1325`	`LIMITED_METHOD_CONTRACT;`
`1326`	`1326`
`1327`		`- PCODE address = (PCODE)addr;`
	`1327`	`+ PCODE address = PINSTRToPCODE((TADDR)addr);`
`1328`	`1328`
`1329`	`1329`	`if ((address >= m_addrOfHotCode) &&`
`1330`	`1330`	`(address < m_addrOfHotCode + m_sizeOfHotCode))`
`@@ -1346,7 +1346,7 @@ class CodeRegionInfo`
`1346`	`1346`	`{`
`1347`	`1347`	`LIMITED_METHOD_CONTRACT;`
`1348`	`1348`
`1349`		`- PCODE address = (PCODE)addr;`
	`1349`	`+ PCODE address = PINSTRToPCODE((TADDR)addr);`
`1350`	`1350`	`return (((address >= m_addrOfHotCode) &&`
`1351`	`1351`	`(address < m_addrOfHotCode + m_sizeOfHotCode)) \|\|`
`1352`	`1352`	`((address >= m_addrOfColdCode) &&`