diff options
Diffstat (limited to 'lldb/tools/debugserver/source')
12 files changed, 29 insertions, 29 deletions
diff --git a/lldb/tools/debugserver/source/DNBDataRef.h b/lldb/tools/debugserver/source/DNBDataRef.h index ecba580fbde..d521700d151 100644 --- a/lldb/tools/debugserver/source/DNBDataRef.h +++ b/lldb/tools/debugserver/source/DNBDataRef.h @@ -31,7 +31,7 @@ class DNBDataRef { public: // For use with Dump - typedef enum { + enum Type { TypeUInt8 = 0, TypeChar, TypeUInt16, @@ -40,7 +40,7 @@ public: TypePointer, TypeULEB128, TypeSLEB128 - } Type; + }; typedef uint32_t offset_t; typedef nub_addr_t addr_t; diff --git a/lldb/tools/debugserver/source/DNBDefs.h b/lldb/tools/debugserver/source/DNBDefs.h index 3ff60d313aa..cd61b31d619 100644 --- a/lldb/tools/debugserver/source/DNBDefs.h +++ b/lldb/tools/debugserver/source/DNBDefs.h @@ -64,7 +64,7 @@ typedef uint32_t nub_bool_t; #define WATCH_TYPE_READ (1u << 0) #define WATCH_TYPE_WRITE (1u << 1) -typedef enum { +enum nub_state_t { eStateInvalid = 0, eStateUnloaded, eStateAttaching, @@ -76,9 +76,9 @@ typedef enum { eStateDetached, eStateExited, eStateSuspended -} nub_state_t; +}; -typedef enum { +enum nub_launch_flavor_t { eLaunchFlavorDefault = 0, eLaunchFlavorPosixSpawn = 1, eLaunchFlavorForkExec = 2, @@ -91,7 +91,7 @@ typedef enum { #ifdef WITH_FBS eLaunchFlavorFBS = 5 #endif -} nub_launch_flavor_t; +}; #define NUB_STATE_IS_RUNNING(s) \ ((s) == eStateAttaching || (s) == eStateLaunching || (s) == eStateRunning || \ diff --git a/lldb/tools/debugserver/source/DNBError.h b/lldb/tools/debugserver/source/DNBError.h index 2ca2d41de8e..7e67cf2c553 100644 --- a/lldb/tools/debugserver/source/DNBError.h +++ b/lldb/tools/debugserver/source/DNBError.h @@ -21,7 +21,7 @@ class DNBError { public: typedef uint32_t ValueType; - typedef enum { + enum FlavorType { Generic = 0, MachKernel = 1, POSIX = 2 @@ -37,7 +37,7 @@ public: , FrontBoard = 5 #endif - } FlavorType; + }; explicit DNBError(ValueType err = 0, FlavorType flavor = Generic) : m_err(err), m_flavor(flavor) {} diff --git a/lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.h b/lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.h index 0bc1b50cdf9..4bb899b4503 100644 --- a/lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.h +++ b/lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.h @@ -113,14 +113,14 @@ protected: nub_addr_t *nextPC, bool *nextPCIsThumb); - typedef enum RegisterSetTag { + enum RegisterSet { e_regSetALL = REGISTER_SET_ALL, e_regSetGPR, // ARM_THREAD_STATE e_regSetVFP, // ARM_VFP_STATE (ARM_NEON_STATE if defined __arm64__) e_regSetEXC, // ARM_EXCEPTION_STATE e_regSetDBG, // ARM_DEBUG_STATE (ARM_DEBUG_STATE32 if defined __arm64__) kNumRegisterSets - } RegisterSet; + }; enum { Read = 0, Write = 1, kNumErrors = 2 }; diff --git a/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.h b/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.h index dc44cd2d086..2c59a0ceb5d 100644 --- a/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.h +++ b/lldb/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.h @@ -75,14 +75,14 @@ protected: kern_return_t EnableHardwareSingleStep(bool enable); static bool FixGenericRegisterNumber(uint32_t &set, uint32_t ®); - typedef enum RegisterSetTag { + enum RegisterSet { e_regSetALL = REGISTER_SET_ALL, e_regSetGPR, // ARM_THREAD_STATE64, e_regSetVFP, // ARM_NEON_STATE64, e_regSetEXC, // ARM_EXCEPTION_STATE64, e_regSetDBG, // ARM_DEBUG_STATE64, kNumRegisterSets - } RegisterSet; + }; enum { e_regSetGPRCount = ARM_THREAD_STATE64_COUNT, diff --git a/lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.h b/lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.h index 80b3c1c5919..12b515a2957 100644 --- a/lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.h +++ b/lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.h @@ -88,23 +88,23 @@ protected: static const size_t k_num_fpu_registers_avx512f; static const size_t k_num_all_registers_avx512f; - typedef enum RegisterSetTag { + enum RegisterSet { e_regSetALL = REGISTER_SET_ALL, e_regSetGPR, e_regSetFPU, e_regSetEXC, e_regSetDBG, kNumRegisterSets - } RegisterSet; + }; - typedef enum RegisterSetWordSizeTag { + enum RegisterSetWordSize { e_regSetWordSizeGPR = sizeof(GPR) / sizeof(int), e_regSetWordSizeFPU = sizeof(FPU) / sizeof(int), e_regSetWordSizeEXC = sizeof(EXC) / sizeof(int), e_regSetWordSizeAVX = sizeof(AVX) / sizeof(int), e_regSetWordSizeAVX512f = sizeof(AVX512F) / sizeof(int), e_regSetWordSizeDBG = sizeof(DBG) / sizeof(int) - } RegisterSetWordSize; + }; enum { Read = 0, Write = 1, kNumErrors = 2 }; diff --git a/lldb/tools/debugserver/source/MacOSX/ppc/DNBArchImpl.h b/lldb/tools/debugserver/source/MacOSX/ppc/DNBArchImpl.h index f9c094b9189..7d20f18d027 100644 --- a/lldb/tools/debugserver/source/MacOSX/ppc/DNBArchImpl.h +++ b/lldb/tools/debugserver/source/MacOSX/ppc/DNBArchImpl.h @@ -45,14 +45,14 @@ public: protected: kern_return_t EnableHardwareSingleStep(bool enable); - typedef enum RegisterSetTag { + enum RegisterSet { e_regSetALL = REGISTER_SET_ALL, e_regSetGPR, e_regSetFPR, e_regSetEXC, e_regSetVEC, kNumRegisterSets - } RegisterSet; + }; typedef enum RegisterSetWordSizeTag { e_regSetWordSizeGPR = PPC_THREAD_STATE_COUNT, diff --git a/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h b/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h index 2ec254de7f2..62ce37d4c04 100644 --- a/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h +++ b/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h @@ -87,23 +87,23 @@ protected: static const size_t k_num_fpu_registers_avx512f; static const size_t k_num_all_registers_avx512f; - typedef enum RegisterSetTag { + enum RegisterSet { e_regSetALL = REGISTER_SET_ALL, e_regSetGPR, e_regSetFPU, e_regSetEXC, e_regSetDBG, kNumRegisterSets - } RegisterSet; + }; - typedef enum RegisterSetWordSizeTag { + enum RegisterSetWordSize { e_regSetWordSizeGPR = sizeof(GPR) / sizeof(int), e_regSetWordSizeFPU = sizeof(FPU) / sizeof(int), e_regSetWordSizeEXC = sizeof(EXC) / sizeof(int), e_regSetWordSizeAVX = sizeof(AVX) / sizeof(int), e_regSetWordSizeAVX512f = sizeof(AVX512F) / sizeof(int), e_regSetWordSizeDBG = sizeof(DBG) / sizeof(int) - } RegisterSetWordSize; + }; enum { Read = 0, Write = 1, kNumErrors = 2 }; diff --git a/lldb/tools/debugserver/source/RNBDefs.h b/lldb/tools/debugserver/source/RNBDefs.h index fbd51f499bf..4cc7c220b7f 100644 --- a/lldb/tools/debugserver/source/RNBDefs.h +++ b/lldb/tools/debugserver/source/RNBDefs.h @@ -75,7 +75,7 @@ extern "C" const double CONCAT(DEBUGSERVER_PROGRAM_SYMBOL, VersionNumber); class RNBRemote; typedef std::shared_ptr<RNBRemote> RNBRemoteSP; -typedef enum { rnb_success = 0, rnb_err = 1, rnb_not_connected = 2 } rnb_err_t; +enum rnb_err_t { rnb_success = 0, rnb_err = 1, rnb_not_connected = 2 }; // Log bits // reserve low bits for DNB diff --git a/lldb/tools/debugserver/source/RNBRemote.h b/lldb/tools/debugserver/source/RNBRemote.h index d59f42af0be..1fb309bbc44 100644 --- a/lldb/tools/debugserver/source/RNBRemote.h +++ b/lldb/tools/debugserver/source/RNBRemote.h @@ -33,7 +33,7 @@ enum class compression_types { zlib_deflate, lz4, lzma, lzfse, none }; class RNBRemote { public: - typedef enum { + enum PacketEnum { invalid_packet = 0, ack, // '+' nack, // '-' @@ -138,7 +138,7 @@ public: query_supported_async_json_packets, // 'QSupportedAsyncJSONPackets' configure_darwin_log, // 'ConfigureDarwinLog:' unknown_type - } PacketEnum; + }; typedef rnb_err_t (RNBRemote::*HandlePacketCallback)(const char *p); diff --git a/lldb/tools/debugserver/source/debugserver.cpp b/lldb/tools/debugserver/source/debugserver.cpp index 1463ff906cf..5a0681847a8 100644 --- a/lldb/tools/debugserver/source/debugserver.cpp +++ b/lldb/tools/debugserver/source/debugserver.cpp @@ -46,7 +46,7 @@ extern "C" int proc_set_wakemon_params(pid_t, int, nub_process_t g_pid = INVALID_NUB_PROCESS; // Run loop modes which determine which run loop function will be called -typedef enum { +enum RNBRunLoopMode { eRNBRunLoopModeInvalid = 0, eRNBRunLoopModeGetStartModeFromRemoteProtocol, eRNBRunLoopModeInferiorAttaching, @@ -54,7 +54,7 @@ typedef enum { eRNBRunLoopModeInferiorExecuting, eRNBRunLoopModePlatformMode, eRNBRunLoopModeExit -} RNBRunLoopMode; +}; // Global Variables RNBRemoteSP g_remoteSP; diff --git a/lldb/tools/debugserver/source/libdebugserver.cpp b/lldb/tools/debugserver/source/libdebugserver.cpp index e545caf5ae8..0b40dd9049f 100644 --- a/lldb/tools/debugserver/source/libdebugserver.cpp +++ b/lldb/tools/debugserver/source/libdebugserver.cpp @@ -27,12 +27,12 @@ #include "SysSignal.h" // Run loop modes which determine which run loop function will be called -typedef enum { +enum RNBRunLoopMode { eRNBRunLoopModeInvalid = 0, eRNBRunLoopModeGetStartModeFromRemoteProtocol, eRNBRunLoopModeInferiorExecuting, eRNBRunLoopModeExit -} RNBRunLoopMode; +}; // Global Variables RNBRemoteSP g_remoteSP; |
