diff --git a/components/fpdebug/app/fpd/fpd.lpi b/components/fpdebug/app/fpd/fpd.lpi index e0c04115a9..f5557cab20 100644 --- a/components/fpdebug/app/fpd/fpd.lpi +++ b/components/fpdebug/app/fpd/fpd.lpi @@ -31,6 +31,8 @@ + + @@ -38,16 +40,11 @@ - + - - - - - @@ -62,16 +59,9 @@ - - - - - - - diff --git a/components/fpdebug/app/fpd/fpdcommand.pas b/components/fpdebug/app/fpd/fpdcommand.pas index bb5d947bb6..88506d0ed1 100644 --- a/components/fpdebug/app/fpd/fpdcommand.pas +++ b/components/fpdebug/app/fpd/fpdcommand.pas @@ -692,7 +692,7 @@ begin end; WriteLN('Callstack:'); - ACallStack := GController.CurrentProcess.MainThread.CreateCallStackEntryList; + //ACallStack := GController.CurrentProcess.MainThread.CreateCallStackEntryList; try for i := 0 to ACallStack.Count-1 do begin diff --git a/components/fpdebug/fpdbgclasses.pp b/components/fpdebug/fpdbgclasses.pp index d0d6abd17d..7b7f7b6d8a 100644 --- a/components/fpdebug/fpdbgclasses.pp +++ b/components/fpdebug/fpdbgclasses.pp @@ -1225,7 +1225,7 @@ begin if not FProcess.WriteData(FLocation, 1, FOrgValue) then begin - Log('Unable to reset breakpoint at $%p', [FLocation]); + Log('Unable to reset breakpoint at %s', [FormatAddress(FLocation)]); Exit; end; end; diff --git a/components/fpdebug/fpdbginfo.pas b/components/fpdebug/fpdbginfo.pas index 0c5726982f..dccd01cbb4 100644 --- a/components/fpdebug/fpdbginfo.pas +++ b/components/fpdebug/fpdbginfo.pas @@ -211,8 +211,8 @@ type property Member[AIndex: Int64]: TFpDbgValue read GetMember; property MemberByName[AIndex: String]: TFpDbgValue read GetMemberByName; // Includes inheritance // For Arrays (TODO pointers) only, the values stored in the array - property MemberCountEx[AIndex: Array of Int64]: Integer read GetMemberCountEx; - property MemberEx[AIndex: Array of Int64]: TFpDbgValue read GetMemberEx; + //property MemberCountEx[AIndex: Array of Int64]: Integer read GetMemberCountEx; + //property MemberEx[AIndex: Array of Int64]: TFpDbgValue read GetMemberEx; property IndexTypeCount: Integer read GetIndexTypeCount; property IndexType[AIndex: Integer]: TFpDbgSymbol read GetIndexType;