[ros-diffs] [dreimer] 45163: Remove the Address Translation from the reladdr2line scripts. This is done in raddr2line and log2lines now. Fixes Bug 5008.

Author: dreimer
Date: Wed Jan 20 22:57:35 2010
New Revision: 45163

URL: http://svn.reactos.org/svn/reactos?rev=45163&view=rev
Log:
Remove the Address Translation from the reladdr2line scripts. This is done in raddr2line
and log2lines now.
Fixes Bug 5008.

Modified:
    trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1
    trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] Wed Jan 20
22:57:35 2010
@@ -32,14 +32,7 @@
 if ("$ADDRESS" -eq "") {
     "ERROR: You must specify a address to analyze."
 }
-$baseaddr = (objdump -p $FILEPATH | select-string
"ImageBase").tostring().split()
-$baseaddr = "0x" + ($baseaddr.get($baseaddr.length - 1))
-if ($baseaddr -lt $ADDRESS) {
-    IEX "& log2lines.exe '$FILEPATH' '$ADDRESS'"
-} else {
-    $baseaddr = ($baseaddr | % {[Convert]::ToInt32($_,16)}) + ($ADDRESS | %
{[Convert]::ToInt32($_,16)})
-    $relbase = "0x" + ("{0:X}" -f $baseaddr)
-    IEX "& log2lines.exe '$FILEPATH' '$relbase'"
-}
+
+IEX "& log2lines.exe '$FILEPATH' '$ADDRESS'"
 
 $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION"

Modified: trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rad…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/raddr2line.cmd [iso-8859-1] Wed Jan 20 22:57:35
2010
@@ -54,22 +54,7 @@
     for /f "usebackq" %%i in (`"dir /a:-d /s /b "%FILEPATH%"
2>NUL | findstr "%FILEPATH%""`) do set FILEPATH=%%i
 )
 
-:: First get the ImageBase of the File. If its smaller than the given
-:: Parameter, everything is ok, because it was already added onto the
-:: adress and can be given directly to raddr2line. If not, add it and
-:: give the result to raddr2line.
-echo %FILEPATH%
-
-for /f "tokens=2" %%i in ('"objdump -p "%FILEPATH%" 2>NUL
| findstr ImageBase"') do set BASEADDRESS=0x%%i
-
-if %%i lss %ADDRESS% (
-    log2lines.exe "%FILEPATH%" "%ADDRESS%"
-) else (
-    set /a BASEADDRESS+=0x%ADDRESS%
-
-    for /f %%i in ('"echoh.exe !BASEADDRESS!"') do set RELBASE=%%i
-    log2lines.exe "!FILEPATH!" "!RELBASE!"
-)
+log2lines.exe "%FILEPATH%" "%ADDRESS%"
 
 :EOC
 title ReactOS Build Environment %_ROSBE_VERSION%