intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-21 03:50:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed redundant isxdigit checks and added the ability to GetHexU8() so it can extract an 8 bit hex value if one is available. It will set EOF if "set_eof_on_fail" is true or if out of data. This allows a string decoder to grab a string without losing the last part of the packet with a packet like "414243,abc" (it can extract "ABC" and leave the file position set to the comma).

Browse Source 
llvm-svn: 154239
This commit is contained in:
Greg Clayton
2012-04-07 00:42:53 +00:00
parent 0235f684f0
commit 7b70be3970
2 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lldb/source/Utility/StringExtractor.cpp
View File

@@ -121,14 +121,10 @@ StringExtractor::GetHexS8 (int8_t fail_value)
{
char hi_nibble_char = m_packet[m_index];
char lo_nibble_char = m_packet[m_index+1];
if (isxdigit(hi_nibble_char) && isxdigit(lo_nibble_char))
{
char hi_nibble = xdigit_to_sint (hi_nibble_char);
char lo_nibble = xdigit_to_sint (lo_nibble_char);
m_index += 2;
return (hi_nibble << 4) + lo_nibble;
}
char hi_nibble = xdigit_to_sint (hi_nibble_char);
char lo_nibble = xdigit_to_sint (lo_nibble_char);
m_index += 2;
return (hi_nibble << 4) + lo_nibble;
}
m_index = UINT32_MAX;
return fail_value;
@@ -139,22 +135,19 @@ StringExtractor::GetHexS8 (int8_t fail_value)
// string
//----------------------------------------------------------------------
uint8_t
StringExtractor::GetHexU8 (uint8_t fail_value)
StringExtractor::GetHexU8 (uint8_t fail_value, bool set_eof_on_fail)
{
if (GetNumHexASCIICharsAtFilePos(2))
{
uint8_t hi_nibble_char = m_packet[m_index];
uint8_t lo_nibble_char = m_packet[m_index+1];
if (isxdigit(hi_nibble_char) && isxdigit(lo_nibble_char))
{
uint8_t hi_nibble = xdigit_to_uint (hi_nibble_char);
uint8_t lo_nibble = xdigit_to_uint (lo_nibble_char);
m_index += 2;
return (hi_nibble << 4) + lo_nibble;
}
uint8_t hi_nibble = xdigit_to_uint (hi_nibble_char);
uint8_t lo_nibble = xdigit_to_uint (lo_nibble_char);
m_index += 2;
return (hi_nibble << 4) + lo_nibble;
}
m_index = UINT32_MAX;
if (set_eof_on_fail || m_index >= m_packet.size())
m_index = UINT32_MAX;
return fail_value;
}

2
lldb/source/Utility/StringExtractor.h
View File

@@ -93,7 +93,7 @@ public:
GetHexS8 (int8_t fail_value = 0);
uint8_t
GetHexU8 (uint8_t fail_value = 0);
GetHexU8 (uint8_t fail_value = 0, bool set_eof_on_fail = true);
bool
GetNameColonValue (std::string &name, std::string &value);