Skip to content

Commit

Permalink
[LLDB] Fix Clang-tidy modernize-use-override warnings in source/Plugi…
Browse files Browse the repository at this point in the history 
…ns/ABI; other minor fixes.

Differential Revision: http://reviews.llvm.org/D13684

llvm-svn: 250538
  • Loading branch information
@EugeneZelenko
EugeneZelenko committed Oct 16, 2015
1 parent b785407 commit 17af3f9
Show file tree
Hide file tree
Showing 12 changed files with 435 additions and 420 deletions.
78 changes: 39 additions & 39 deletions lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h
View file
Expand Up @@ -20,42 +20,36 @@
class ABIMacOSX_arm : public lldb_private::ABI
{
public:
~ABIMacOSX_arm() { }
~ABIMacOSX_arm() override = default;

virtual size_t
GetRedZoneSize () const;
size_t
GetRedZoneSize() const override;

virtual bool
PrepareTrivialCall (lldb_private::Thread &thread,
lldb::addr_t sp,
lldb::addr_t func_addr,
lldb::addr_t returnAddress,
llvm::ArrayRef<lldb::addr_t> args) const;
bool
PrepareTrivialCall(lldb_private::Thread &thread,
lldb::addr_t sp,
lldb::addr_t func_addr,
lldb::addr_t returnAddress,
llvm::ArrayRef<lldb::addr_t> args) const override;

virtual bool
GetArgumentValues (lldb_private::Thread &thread,
lldb_private::ValueList &values) const;
bool
GetArgumentValues(lldb_private::Thread &thread,
lldb_private::ValueList &values) const override;

virtual lldb_private::Error
SetReturnValueObject(lldb::StackFrameSP &frame_sp, lldb::ValueObjectSP &new_value);
lldb_private::Error
SetReturnValueObject(lldb::StackFrameSP &frame_sp, lldb::ValueObjectSP &new_value) override;

protected:
virtual lldb::ValueObjectSP
GetReturnValueObjectImpl (lldb_private::Thread &thread,
lldb_private::CompilerType &ast_type) const;

public:
virtual bool
CreateFunctionEntryUnwindPlan (lldb_private::UnwindPlan &unwind_plan);
bool
CreateFunctionEntryUnwindPlan(lldb_private::UnwindPlan &unwind_plan) override;

virtual bool
CreateDefaultUnwindPlan (lldb_private::UnwindPlan &unwind_plan);
bool
CreateDefaultUnwindPlan(lldb_private::UnwindPlan &unwind_plan) override;

virtual bool
RegisterIsVolatile (const lldb_private::RegisterInfo *reg_info);
bool
RegisterIsVolatile(const lldb_private::RegisterInfo *reg_info) override;

virtual bool
CallFrameAddressIsValid (lldb::addr_t cfa)
bool
CallFrameAddressIsValid(lldb::addr_t cfa) override
{
// Make sure the stack call frame addresses are are 4 byte aligned
if (cfa & (4ull - 1ull))
Expand All @@ -65,29 +59,30 @@ class ABIMacOSX_arm : public lldb_private::ABI
return true;
}

virtual bool
CodeAddressIsValid (lldb::addr_t pc)
bool
CodeAddressIsValid(lldb::addr_t pc) override
{
// Just make sure the address is a valid 32 bit address. Bit zero
// might be set due to Thumb function calls, so don't enforce 2 byte
// alignment
return pc <= UINT32_MAX;
}

virtual lldb::addr_t
FixCodeAddress (lldb::addr_t pc)
lldb::addr_t
FixCodeAddress(lldb::addr_t pc) override
{
// ARM uses bit zero to signify a code address is thumb, so we must
// strip bit zero in any code addresses.
return pc & ~(lldb::addr_t)1;
}

virtual const lldb_private::RegisterInfo *
GetRegisterInfoArray (uint32_t &count);
const lldb_private::RegisterInfo *
GetRegisterInfoArray(uint32_t &count) override;

//------------------------------------------------------------------
// Static Functions
//------------------------------------------------------------------

static void
Initialize();

Expand All @@ -103,13 +98,18 @@ class ABIMacOSX_arm : public lldb_private::ABI
//------------------------------------------------------------------
// PluginInterface protocol
//------------------------------------------------------------------
virtual lldb_private::ConstString
GetPluginName();

lldb_private::ConstString
GetPluginName() override;

virtual uint32_t
GetPluginVersion();
uint32_t
GetPluginVersion() override;

protected:
lldb::ValueObjectSP
GetReturnValueObjectImpl(lldb_private::Thread &thread,
lldb_private::CompilerType &ast_type) const override;

private:
ABIMacOSX_arm() :
lldb_private::ABI()
Expand All @@ -118,4 +118,4 @@ class ABIMacOSX_arm : public lldb_private::ABI
}
};

#endif // liblldb_ABIMacOSX_arm_h_
#endif // liblldb_ABIMacOSX_arm_h_
69 changes: 35 additions & 34 deletions lldb/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.h
View file
Expand Up @@ -22,30 +22,30 @@ class ABIMacOSX_arm64 :
public lldb_private::ABI
{
public:
~ABIMacOSX_arm64() { }
~ABIMacOSX_arm64() override = default;

virtual size_t
GetRedZoneSize () const;
size_t
GetRedZoneSize() const override;

virtual bool
PrepareTrivialCall (lldb_private::Thread &thread,
lldb::addr_t sp,
lldb::addr_t functionAddress,
lldb::addr_t returnAddress,
llvm::ArrayRef<lldb::addr_t> args) const;
bool
PrepareTrivialCall(lldb_private::Thread &thread,
lldb::addr_t sp,
lldb::addr_t functionAddress,
lldb::addr_t returnAddress,
llvm::ArrayRef<lldb::addr_t> args) const override;

virtual bool
GetArgumentValues (lldb_private::Thread &thread,
lldb_private::ValueList &values) const;
bool
GetArgumentValues(lldb_private::Thread &thread,
lldb_private::ValueList &values) const override;

virtual bool
CreateFunctionEntryUnwindPlan (lldb_private::UnwindPlan &unwind_plan);
bool
CreateFunctionEntryUnwindPlan(lldb_private::UnwindPlan &unwind_plan) override;

virtual bool
CreateDefaultUnwindPlan (lldb_private::UnwindPlan &unwind_plan);
bool
CreateDefaultUnwindPlan(lldb_private::UnwindPlan &unwind_plan) override;

virtual bool
RegisterIsVolatile (const lldb_private::RegisterInfo *reg_info);
bool
RegisterIsVolatile(const lldb_private::RegisterInfo *reg_info) override;

// The arm64 ABI requires that stack frames be 16 byte aligned.
// When there is a trap handler on the stack, e.g. _sigtramp in userland
Expand All @@ -57,9 +57,8 @@ class ABIMacOSX_arm64 :
// Whitelisting the trap handlers for user space would be easy (_sigtramp) but
// in other environments there can be a large number of different functions
// involved in async traps.

virtual bool
CallFrameAddressIsValid (lldb::addr_t cfa)
bool
CallFrameAddressIsValid(lldb::addr_t cfa) override
{
// Make sure the stack call frame addresses are are 8 byte aligned
if (cfa & (8ull - 1ull))
Expand All @@ -69,8 +68,8 @@ class ABIMacOSX_arm64 :
return true;
}

virtual bool
CodeAddressIsValid (lldb::addr_t pc)
bool
CodeAddressIsValid(lldb::addr_t pc) override
{
if (pc & (4ull - 1ull))
return false; // Not 4 byte aligned
Expand All @@ -79,12 +78,13 @@ class ABIMacOSX_arm64 :
return true;
}

virtual const lldb_private::RegisterInfo *
GetRegisterInfoArray (uint32_t &count);
const lldb_private::RegisterInfo *
GetRegisterInfoArray(uint32_t &count) override;

//------------------------------------------------------------------
// Static Functions
//------------------------------------------------------------------

static void
Initialize();

Expand All @@ -97,25 +97,26 @@ class ABIMacOSX_arm64 :
//------------------------------------------------------------------
// PluginInterface protocol
//------------------------------------------------------------------

static lldb_private::ConstString
GetPluginNameStatic();

virtual lldb_private::ConstString
GetPluginName()
lldb_private::ConstString
GetPluginName() override
{
return GetPluginNameStatic();
}

virtual uint32_t
GetPluginVersion();
uint32_t
GetPluginVersion() override;

virtual lldb_private::Error
SetReturnValueObject(lldb::StackFrameSP &frame_sp, lldb::ValueObjectSP &new_value);
lldb_private::Error
SetReturnValueObject(lldb::StackFrameSP &frame_sp, lldb::ValueObjectSP &new_value) override;

protected:
virtual lldb::ValueObjectSP
lldb::ValueObjectSP
GetReturnValueObjectImpl (lldb_private::Thread &thread,
lldb_private::CompilerType &ast_type) const;
lldb_private::CompilerType &ast_type) const override;

private:
ABIMacOSX_arm64() :
Expand All @@ -125,4 +126,4 @@ class ABIMacOSX_arm64 :
}
};

#endif // liblldb_ABI_h_
#endif // liblldb_ABIMacOSX_arm64_h_
83 changes: 42 additions & 41 deletions lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h
View file
Expand Up @@ -22,41 +22,33 @@ class ABIMacOSX_i386 :
public lldb_private::ABI
{
public:

~ABIMacOSX_i386() { }
~ABIMacOSX_i386() override = default;

virtual size_t
GetRedZoneSize () const;
size_t
GetRedZoneSize() const override;

virtual bool
PrepareTrivialCall (lldb_private::Thread &thread,
lldb::addr_t sp,
lldb::addr_t func_addr,
lldb::addr_t return_addr,
llvm::ArrayRef<lldb::addr_t> args) const;
bool
PrepareTrivialCall(lldb_private::Thread &thread,
lldb::addr_t sp,
lldb::addr_t func_addr,
lldb::addr_t return_addr,
llvm::ArrayRef<lldb::addr_t> args) const override;

virtual bool
GetArgumentValues (lldb_private::Thread &thread,
lldb_private::ValueList &values) const;
bool
GetArgumentValues(lldb_private::Thread &thread,
lldb_private::ValueList &values) const override;

virtual lldb_private::Error
SetReturnValueObject(lldb::StackFrameSP &frame_sp, lldb::ValueObjectSP &new_value);

protected:
virtual lldb::ValueObjectSP
GetReturnValueObjectImpl (lldb_private::Thread &thread,
lldb_private::CompilerType &ast_type) const;
lldb_private::Error
SetReturnValueObject(lldb::StackFrameSP &frame_sp, lldb::ValueObjectSP &new_value) override;

public:

virtual bool
CreateFunctionEntryUnwindPlan (lldb_private::UnwindPlan &unwind_plan);
bool
CreateFunctionEntryUnwindPlan(lldb_private::UnwindPlan &unwind_plan) override;

virtual bool
CreateDefaultUnwindPlan (lldb_private::UnwindPlan &unwind_plan);
bool
CreateDefaultUnwindPlan(lldb_private::UnwindPlan &unwind_plan) override;

virtual bool
RegisterIsVolatile (const lldb_private::RegisterInfo *reg_info);
bool
RegisterIsVolatile(const lldb_private::RegisterInfo *reg_info) override;

// The Darwin i386 ABI requires that stack frames be 16 byte aligned.
// When there is a trap handler on the stack, e.g. _sigtramp in userland
Expand All @@ -71,8 +63,8 @@ class ABIMacOSX_i386 :
//
// If we were to enforce 16-byte alignment, we also need to relax to 4-byte
// alignment for non-darwin i386 targets.
virtual bool
CallFrameAddressIsValid (lldb::addr_t cfa)
bool
CallFrameAddressIsValid(lldb::addr_t cfa) override
{
// Make sure the stack call frame addresses are are 4 byte aligned
if (cfa & (4ull - 1ull))
Expand All @@ -82,19 +74,20 @@ class ABIMacOSX_i386 :
return true;
}

virtual bool
CodeAddressIsValid (lldb::addr_t pc)
bool
CodeAddressIsValid(lldb::addr_t pc) override
{
// Just make sure the address is a valid 32 bit address.
return pc <= UINT32_MAX;
}

virtual const lldb_private::RegisterInfo *
GetRegisterInfoArray (uint32_t &count);
const lldb_private::RegisterInfo *
GetRegisterInfoArray(uint32_t &count) override;

//------------------------------------------------------------------
// Static Functions
//------------------------------------------------------------------

static void
Initialize();

Expand All @@ -107,22 +100,30 @@ class ABIMacOSX_i386 :
//------------------------------------------------------------------
// PluginInterface protocol
//------------------------------------------------------------------

static lldb_private::ConstString
GetPluginNameStatic ();

virtual lldb_private::ConstString
GetPluginName();
lldb_private::ConstString
GetPluginName() override;

virtual uint32_t
GetPluginVersion();
uint32_t
GetPluginVersion() override;

protected:
lldb::ValueObjectSP
GetReturnValueObjectImpl(lldb_private::Thread &thread,
lldb_private::CompilerType &ast_type) const override;

bool
RegisterIsCalleeSaved (const lldb_private::RegisterInfo *reg_info);

private:
ABIMacOSX_i386() : lldb_private::ABI() { } // Call CreateInstance instead.
ABIMacOSX_i386() :
lldb_private::ABI()
{
// Call CreateInstance instead.
}
};


#endif // liblldb_ABI_h_
#endif // liblldb_ABIMacOSX_i386_h_

0 comments on commit 17af3f9

Please sign in to comment.