Bläddra i källkod

* TGDBMI_Value.AsPtrInt replaced with .AsCoreAddr, which returns CORE_ADDR
instead of PtrInt

git-svn-id: trunk@30070 -

nickysn 10 år sedan
förälder
incheckning
1e842ffb6f
3 ändrade filer med 7 tillägg och 5 borttagningar
  1. 1 1
      ide/gdbmicon.pas
  2. 1 1
      ide/gdbmiint.pas
  3. 5 3
      ide/gdbmiwrap.pas

+ 1 - 1
ide/gdbmicon.pas

@@ -435,7 +435,7 @@ begin
     frames[I] := New(PFrameEntry, Init);
   for I := 0 to FrameList.Count - 1 do
   begin
-    frames[I]^.address := FrameList.ValueAt[I].AsTuple['addr'].AsPtrInt;
+    frames[I]^.address := FrameList.ValueAt[I].AsTuple['addr'].AsCoreAddr;
     frames[I]^.level := FrameList.ValueAt[I].AsTuple['level'].AsLongInt;
     if Assigned(FrameList.ValueAt[I].AsTuple['line']) then
       frames[I]^.line_number := FrameList.ValueAt[I].AsTuple['line'].AsLongInt;

+ 1 - 1
ide/gdbmiint.pas

@@ -374,7 +374,7 @@ Ignore:
         else
           BreakpointNo := 0;
 
-        Addr := GDB.ExecAsyncOutput.Parameters['frame'].AsTuple['addr'].AsPtrInt;
+        Addr := GDB.ExecAsyncOutput.Parameters['frame'].AsTuple['addr'].AsCoreAddr;
         if Assigned(GDB.ExecAsyncOutput.Parameters['frame'].AsTuple['fullname']) then
           FileName := GDB.ExecAsyncOutput.Parameters['frame'].AsTuple['fullname'].AsString;
         if Assigned(GDB.ExecAsyncOutput.Parameters['frame'].AsTuple['line']) then

+ 5 - 3
ide/gdbmiwrap.pas

@@ -38,7 +38,7 @@ type
   TGDBMI_Value = class
     function AsString: string;
     function AsLongInt: LongInt;
-    function AsPtrInt: PtrInt;
+    function AsCoreAddr: CORE_ADDR;
     function AsTuple: TGDBMI_TupleValue;
     function AsList: TGDBMI_ListValue;
   end;
@@ -164,9 +164,11 @@ begin
   Result := StrToInt(AsString);
 end;
 
-function TGDBMI_Value.AsPtrInt: PtrInt;
+function TGDBMI_Value.AsCoreAddr: CORE_ADDR;
 begin
-{$ifdef CPU64}
+{$if defined(TARGET_IS_64BIT)}
+  Result := StrToQWord(AsString);
+{$elseif defined(CPU64)}
   Result := StrToInt64(AsString);
 {$else}
   Result := StrToInt(AsString);