Index: RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 =================================================================== --- RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 (revision 44523) +++ RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 (working copy) @@ -32,14 +32,6 @@ 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 "& '$_ROSBE_BASEDIR\Tools\raddr2line.exe' '$FILEPATH' '$ADDRESS'" -} else { - $baseaddr = ($baseaddr | % {[Convert]::ToInt32($_,16)}) + ($ADDRESS | % {[Convert]::ToInt32($_,16)}) - $relbase = "0x" + ("{0:X}" -f $baseaddr) - IEX "& '$_ROSBE_BASEDIR\Tools\raddr2line.exe' '$FILEPATH' '$relbase'" -} +IEX "& '$_ROSBE_BASEDIR\Tools\raddr2line.exe' '$FILEPATH' '$ADDRESS'" $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" Index: RosBE/RosBE-Windows/Root/raddr2line.cmd =================================================================== --- RosBE/RosBE-Windows/Root/raddr2line.cmd (revision 44523) +++ RosBE/RosBE-Windows/Root/raddr2line.cmd (working copy) @@ -54,23 +54,10 @@ 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% +%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%FILEPATH%" "%ADDRESS%" -for /f "tokens=2" %%i in ('"objdump -p "%FILEPATH%" 2>NUL | findstr ImageBase"') do set BASEADDRESS=0x%%i - -if %%i lss %ADDRESS% ( - "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%FILEPATH%" "%ADDRESS%" -) else ( - set /a BASEADDRESS+=0x%ADDRESS% - - for /f %%i in ('""%_ROSBE_BASEDIR%\Tools\echoh.exe" !BASEADDRESS!"') do set RELBASE=%%i - "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "!FILEPATH!" "!RELBASE!" -) - :EOC title ReactOS Build Environment %_ROSBE_VERSION% endlocal