1
0
mirror of https://github.com/google/cpu_features.git synced 2025-08-16 19:24:35 +02:00

Explicitly namespace every extern identifier

This commit is contained in:
Arvid Gerstmann
2018-04-26 10:31:03 +02:00
parent 7eca4a7a39
commit a1ffdcbe70
12 changed files with 112 additions and 112 deletions

View File

@@ -24,14 +24,14 @@
CPU_FEATURES_START_CPP_NAMESPACE CPU_FEATURES_START_CPP_NAMESPACE
// Same as linux "open(filename, O_RDONLY)", retries automatically on EINTR. // Same as linux "open(filename, O_RDONLY)", retries automatically on EINTR.
int OpenFile(const char* filename); int CpuFeatures_OpenFile(const char* filename);
// Same as linux "read(file_descriptor, buffer, buffer_size)", retries // Same as linux "read(file_descriptor, buffer, buffer_size)", retries
// automatically on EINTR. // automatically on EINTR.
int ReadFile(int file_descriptor, void* buffer, size_t buffer_size); int CpuFeatures_ReadFile(int file_descriptor, void* buffer, size_t buffer_size);
// Same as linux "close(file_descriptor)". // Same as linux "close(file_descriptor)".
void CloseFile(int file_descriptor); void CpuFeatures_CloseFile(int file_descriptor);
CPU_FEATURES_END_CPP_NAMESPACE CPU_FEATURES_END_CPP_NAMESPACE

View File

@@ -66,7 +66,7 @@ typedef struct {
uint32_t hwcaps2; uint32_t hwcaps2;
} HardwareCapabilities; } HardwareCapabilities;
HardwareCapabilities GetHardwareCapabilities(void); HardwareCapabilities CpuFeatures_GetHardwareCapabilities(void);
CPU_FEATURES_END_CPP_NAMESPACE CPU_FEATURES_END_CPP_NAMESPACE

View File

@@ -43,13 +43,13 @@ typedef struct {
// For every config, looks into flags_line for the presence of the // For every config, looks into flags_line for the presence of the
// corresponding proc_cpuinfo_flag, calls `set_bit` accordingly. // corresponding proc_cpuinfo_flag, calls `set_bit` accordingly.
// Note: features is a pointer to the underlying Feature struct. // Note: features is a pointer to the underlying Feature struct.
void SetFromFlags(const size_t configs_size, const CapabilityConfig* configs, void CpuFeatures_SetFromFlags(const size_t configs_size, const CapabilityConfig* configs,
const StringView flags_line, void* const features); const StringView flags_line, void* const features);
// For every config, looks into hwcaps for the presence of the feature. Calls // For every config, looks into hwcaps for the presence of the feature. Calls
// `set_bit` with true if the hardware capability is found. // `set_bit` with true if the hardware capability is found.
// Note: features is a pointer to the underlying Feature struct. // Note: features is a pointer to the underlying Feature struct.
void OverrideFromHwCaps(const size_t configs_size, void CpuFeatures_OverrideFromHwCaps(const size_t configs_size,
const CapabilityConfig* configs, const CapabilityConfig* configs,
const HardwareCapabilities hwcaps, const HardwareCapabilities hwcaps,
void* const features); void* const features);

View File

@@ -46,54 +46,54 @@ static inline StringView view(const char* str, const size_t size) {
static inline StringView str(const char* str) { return view(str, strlen(str)); } static inline StringView str(const char* str) { return view(str, strlen(str)); }
// Returns the index of the first occurrence of c in view or -1 if not found. // Returns the index of the first occurrence of c in view or -1 if not found.
int IndexOfChar(const StringView view, char c); int CpuFeatures_StringView_IndexOfChar(const StringView view, char c);
// Returns the index of the first occurrence of sub_view in view or -1 if not // Returns the index of the first occurrence of sub_view in view or -1 if not
// found. // found.
int IndexOf(const StringView view, const StringView sub_view); int CpuFeatures_StringView_IndexOf(const StringView view, const StringView sub_view);
// Returns whether a is equal to b (same content). // Returns whether a is equal to b (same content).
bool IsEquals(const StringView a, const StringView b); bool CpuFeatures_StringView_IsEquals(const StringView a, const StringView b);
// Returns whether a starts with b. // Returns whether a starts with b.
bool StartsWith(const StringView a, const StringView b); bool CpuFeatures_StringView_StartsWith(const StringView a, const StringView b);
// Removes count characters from the beginning of view or kEmptyStringView if // Removes count characters from the beginning of view or kEmptyStringView if
// count if greater than view.size. // count if greater than view.size.
StringView PopFront(const StringView view, size_t count); StringView CpuFeatures_StringView_PopFront(const StringView view, size_t count);
// Removes count characters from the end of view or kEmptyStringView if count if // Removes count characters from the end of view or kEmptyStringView if count if
// greater than view.size. // greater than view.size.
StringView PopBack(const StringView str_view, size_t count); StringView CpuFeatures_StringView_PopBack(const StringView str_view, size_t count);
// Keeps the count first characters of view or view if count if greater than // Keeps the count first characters of view or view if count if greater than
// view.size. // view.size.
StringView KeepFront(const StringView view, size_t count); StringView CpuFeatures_StringView_KeepFront(const StringView view, size_t count);
// Retrieves the first character of view. If view is empty the behavior is // Retrieves the first character of view. If view is empty the behavior is
// undefined. // undefined.
char Front(const StringView view); char CpuFeatures_StringView_Front(const StringView view);
// Retrieves the last character of view. If view is empty the behavior is // Retrieves the last character of view. If view is empty the behavior is
// undefined. // undefined.
char Back(const StringView view); char CpuFeatures_StringView_Back(const StringView view);
// Removes leading and tailing space characters. // Removes leading and tailing space characters.
StringView TrimWhitespace(StringView view); StringView CpuFeatures_StringView_TrimWhitespace(StringView view);
// Convert StringView to positive integer. e.g. "42", "0x2a". // Convert StringView to positive integer. e.g. "42", "0x2a".
// Returns -1 on error. // Returns -1 on error.
int ParsePositiveNumber(const StringView view); int CpuFeatures_StringView_ParsePositiveNumber(const StringView view);
// Copies src StringView to dst buffer. // Copies src StringView to dst buffer.
void CopyString(const StringView src, char* dst, size_t dst_size); void CpuFeatures_StringView_CopyString(const StringView src, char* dst, size_t dst_size);
// Checks if line contains the specified whitespace separated word. // Checks if line contains the specified whitespace separated word.
bool HasWord(const StringView line, const char* const word); bool CpuFeatures_StringView_HasWord(const StringView line, const char* const word);
// Get key/value from line. key and value are separated by ": ". // Get key/value from line. key and value are separated by ": ".
// key and value are cleaned up from leading and trailing whitespaces. // key and value are cleaned up from leading and trailing whitespaces.
bool GetAttributeKeyValue(const StringView line, StringView* key, bool CpuFeatures_StringView_GetAttributeKeyValue(const StringView line, StringView* key,
StringView* value); StringView* value);
CPU_FEATURES_END_CPP_NAMESPACE CPU_FEATURES_END_CPP_NAMESPACE

View File

@@ -46,24 +46,24 @@ static bool HandleAarch64Line(const LineResult result,
Aarch64Info* const info) { Aarch64Info* const info) {
StringView line = result.line; StringView line = result.line;
StringView key, value; StringView key, value;
if (GetAttributeKeyValue(line, &key, &value)) { if (CpuFeatures_StringView_GetAttributeKeyValue(line, &key, &value)) {
if (IsEquals(key, str("Features"))) { if (CpuFeatures_StringView_IsEquals(key, str("Features"))) {
SetFromFlags(kConfigsSize, kConfigs, value, &info->features); CpuFeatures_SetFromFlags(kConfigsSize, kConfigs, value, &info->features);
} else if (IsEquals(key, str("CPU implementer"))) { } else if (CpuFeatures_StringView_IsEquals(key, str("CPU implementer"))) {
info->implementer = ParsePositiveNumber(value); info->implementer = CpuFeatures_StringView_ParsePositiveNumber(value);
} else if (IsEquals(key, str("CPU variant"))) { } else if (CpuFeatures_StringView_IsEquals(key, str("CPU variant"))) {
info->variant = ParsePositiveNumber(value); info->variant = CpuFeatures_StringView_ParsePositiveNumber(value);
} else if (IsEquals(key, str("CPU part"))) { } else if (CpuFeatures_StringView_IsEquals(key, str("CPU part"))) {
info->part = ParsePositiveNumber(value); info->part = CpuFeatures_StringView_ParsePositiveNumber(value);
} else if (IsEquals(key, str("CPU revision"))) { } else if (CpuFeatures_StringView_IsEquals(key, str("CPU revision"))) {
info->revision = ParsePositiveNumber(value); info->revision = CpuFeatures_StringView_ParsePositiveNumber(value);
} }
} }
return !result.eof; return !result.eof;
} }
static void FillProcCpuInfoData(Aarch64Info* const info) { static void FillProcCpuInfoData(Aarch64Info* const info) {
const int fd = OpenFile("/proc/cpuinfo"); const int fd = CpuFeatures_OpenFile("/proc/cpuinfo");
if (fd >= 0) { if (fd >= 0) {
StackLineReader reader; StackLineReader reader;
StackLineReader_Initialize(&reader, fd); StackLineReader_Initialize(&reader, fd);
@@ -72,7 +72,7 @@ static void FillProcCpuInfoData(Aarch64Info* const info) {
break; break;
} }
} }
CloseFile(fd); CpuFeatures_CloseFile(fd);
} }
} }
@@ -85,7 +85,7 @@ Aarch64Info GetAarch64Info(void) {
Aarch64Info info = kEmptyAarch64Info; Aarch64Info info = kEmptyAarch64Info;
FillProcCpuInfoData(&info); FillProcCpuInfoData(&info);
OverrideFromHwCaps(kConfigsSize, kConfigs, GetHardwareCapabilities(), CpuFeatures_OverrideFromHwCaps(kConfigsSize, kConfigs, CpuFeatures_GetHardwareCapabilities(),
&info.features); &info.features);
return info; return info;

View File

@@ -62,8 +62,8 @@ typedef struct {
static int IndexOfNonDigit(StringView str) { static int IndexOfNonDigit(StringView str) {
size_t index = 0; size_t index = 0;
while (str.size && isdigit(Front(str))) { while (str.size && isdigit(CpuFeatures_StringView_Front(str))) {
str = PopFront(str, 1); str = CpuFeatures_StringView_PopFront(str, 1);
++index; ++index;
} }
return index; return index;
@@ -73,26 +73,26 @@ static bool HandleArmLine(const LineResult result, ArmInfo* const info,
ProcCpuInfoData* const proc_info) { ProcCpuInfoData* const proc_info) {
StringView line = result.line; StringView line = result.line;
StringView key, value; StringView key, value;
if (GetAttributeKeyValue(line, &key, &value)) { if (CpuFeatures_StringView_GetAttributeKeyValue(line, &key, &value)) {
if (IsEquals(key, str("Features"))) { if (CpuFeatures_StringView_IsEquals(key, str("Features"))) {
SetFromFlags(kConfigsSize, kConfigs, value, &info->features); CpuFeatures_SetFromFlags(kConfigsSize, kConfigs, value, &info->features);
} else if (IsEquals(key, str("CPU implementer"))) { } else if (CpuFeatures_StringView_IsEquals(key, str("CPU implementer"))) {
info->implementer = ParsePositiveNumber(value); info->implementer = CpuFeatures_StringView_ParsePositiveNumber(value);
} else if (IsEquals(key, str("CPU variant"))) { } else if (CpuFeatures_StringView_IsEquals(key, str("CPU variant"))) {
info->variant = ParsePositiveNumber(value); info->variant = CpuFeatures_StringView_ParsePositiveNumber(value);
} else if (IsEquals(key, str("CPU part"))) { } else if (CpuFeatures_StringView_IsEquals(key, str("CPU part"))) {
info->part = ParsePositiveNumber(value); info->part = CpuFeatures_StringView_ParsePositiveNumber(value);
} else if (IsEquals(key, str("CPU revision"))) { } else if (CpuFeatures_StringView_IsEquals(key, str("CPU revision"))) {
info->revision = ParsePositiveNumber(value); info->revision = CpuFeatures_StringView_ParsePositiveNumber(value);
} else if (IsEquals(key, str("CPU architecture"))) { } else if (CpuFeatures_StringView_IsEquals(key, str("CPU architecture"))) {
// CPU architecture is a number that may be followed by letters. e.g. // CPU architecture is a number that may be followed by letters. e.g.
// "6TEJ", "7". // "6TEJ", "7".
const StringView digits = KeepFront(value, IndexOfNonDigit(value)); const StringView digits = CpuFeatures_StringView_KeepFront(value, IndexOfNonDigit(value));
info->architecture = ParsePositiveNumber(digits); info->architecture = CpuFeatures_StringView_ParsePositiveNumber(digits);
} else if (IsEquals(key, str("Processor"))) { } else if (CpuFeatures_StringView_IsEquals(key, str("Processor"))) {
proc_info->processor_reports_armv6 = IndexOf(value, str("(v6l)")) >= 0; proc_info->processor_reports_armv6 = CpuFeatures_StringView_IndexOf(value, str("(v6l)")) >= 0;
} else if (IsEquals(key, str("Hardware"))) { } else if (CpuFeatures_StringView_IsEquals(key, str("Hardware"))) {
proc_info->hardware_reports_goldfish = IsEquals(value, str("Goldfish")); proc_info->hardware_reports_goldfish = CpuFeatures_StringView_IsEquals(value, str("Goldfish"));
} }
} }
return !result.eof; return !result.eof;
@@ -148,7 +148,7 @@ static void FixErrors(ArmInfo* const info,
static void FillProcCpuInfoData(ArmInfo* const info, static void FillProcCpuInfoData(ArmInfo* const info,
ProcCpuInfoData* proc_cpu_info_data) { ProcCpuInfoData* proc_cpu_info_data) {
const int fd = OpenFile("/proc/cpuinfo"); const int fd = CpuFeatures_OpenFile("/proc/cpuinfo");
if (fd >= 0) { if (fd >= 0) {
StackLineReader reader; StackLineReader reader;
StackLineReader_Initialize(&reader, fd); StackLineReader_Initialize(&reader, fd);
@@ -158,7 +158,7 @@ static void FillProcCpuInfoData(ArmInfo* const info,
break; break;
} }
} }
CloseFile(fd); CpuFeatures_CloseFile(fd);
} }
} }
@@ -174,7 +174,7 @@ ArmInfo GetArmInfo(void) {
ProcCpuInfoData proc_cpu_info_data = kEmptyProcCpuInfoData; ProcCpuInfoData proc_cpu_info_data = kEmptyProcCpuInfoData;
FillProcCpuInfoData(&info, &proc_cpu_info_data); FillProcCpuInfoData(&info, &proc_cpu_info_data);
OverrideFromHwCaps(kConfigsSize, kConfigs, GetHardwareCapabilities(), CpuFeatures_OverrideFromHwCaps(kConfigsSize, kConfigs, CpuFeatures_GetHardwareCapabilities(),
&info.features); &info.features);
FixErrors(&info, &proc_cpu_info_data); FixErrors(&info, &proc_cpu_info_data);

View File

@@ -32,16 +32,16 @@ static bool HandleMipsLine(const LineResult result,
MipsFeatures* const features) { MipsFeatures* const features) {
StringView key, value; StringView key, value;
// See tests for an example. // See tests for an example.
if (GetAttributeKeyValue(result.line, &key, &value)) { if (CpuFeatures_StringView_GetAttributeKeyValue(result.line, &key, &value)) {
if (IsEquals(key, str("ASEs implemented"))) { if (CpuFeatures_StringView_IsEquals(key, str("ASEs implemented"))) {
SetFromFlags(kConfigsSize, kConfigs, value, features); CpuFeatures_SetFromFlags(kConfigsSize, kConfigs, value, features);
} }
} }
return !result.eof; return !result.eof;
} }
static void FillProcCpuInfoData(MipsFeatures* const features) { static void FillProcCpuInfoData(MipsFeatures* const features) {
const int fd = OpenFile("/proc/cpuinfo"); const int fd = CpuFeatures_OpenFile("/proc/cpuinfo");
if (fd >= 0) { if (fd >= 0) {
StackLineReader reader; StackLineReader reader;
StackLineReader_Initialize(&reader, fd); StackLineReader_Initialize(&reader, fd);
@@ -50,7 +50,7 @@ static void FillProcCpuInfoData(MipsFeatures* const features) {
break; break;
} }
} }
CloseFile(fd); CpuFeatures_CloseFile(fd);
} }
} }
@@ -63,7 +63,7 @@ MipsInfo GetMipsInfo(void) {
MipsInfo info = kEmptyMipsInfo; MipsInfo info = kEmptyMipsInfo;
FillProcCpuInfoData(&info.features); FillProcCpuInfoData(&info.features);
OverrideFromHwCaps(kConfigsSize, kConfigs, GetHardwareCapabilities(), CpuFeatures_OverrideFromHwCaps(kConfigsSize, kConfigs, CpuFeatures_GetHardwareCapabilities(),
&info.features); &info.features);
return info; return info;
} }

View File

@@ -21,18 +21,18 @@
#if defined(_MSC_VER) #if defined(_MSC_VER)
#include <io.h> #include <io.h>
int OpenFile(const char* filename) { return _open(filename, _O_RDONLY); } int CpuFeatures_OpenFile(const char* filename) { return _open(filename, _O_RDONLY); }
void CloseFile(int file_descriptor) { _close(file_descriptor); } void CpuFeatures_CloseFile(int file_descriptor) { _close(file_descriptor); }
int ReadFile(int file_descriptor, void* buffer, size_t buffer_size) { int CpuFeatures_ReadFile(int file_descriptor, void* buffer, size_t buffer_size) {
return _read(file_descriptor, buffer, buffer_size); return _read(file_descriptor, buffer, buffer_size);
} }
#else #else
#include <unistd.h> #include <unistd.h>
int OpenFile(const char* filename) { int CpuFeatures_OpenFile(const char* filename) {
int result; int result;
do { do {
result = open(filename, O_RDONLY); result = open(filename, O_RDONLY);
@@ -40,9 +40,9 @@ int OpenFile(const char* filename) {
return result; return result;
} }
void CloseFile(int file_descriptor) { close(file_descriptor); } void CpuFeatures_CloseFile(int file_descriptor) { close(file_descriptor); }
int ReadFile(int file_descriptor, void* buffer, size_t buffer_size) { int CpuFeatures_ReadFile(int file_descriptor, void* buffer, size_t buffer_size) {
int result; int result;
do { do {
result = read(file_descriptor, buffer, buffer_size); result = read(file_descriptor, buffer, buffer_size);

View File

@@ -159,7 +159,7 @@ HardwareCapabilities GetHardwareCapabilities(void) {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
const HardwareCapabilities kEmptyHardwareCapabilities; const HardwareCapabilities kEmptyHardwareCapabilities;
HardwareCapabilities GetHardwareCapabilities(void) { HardwareCapabilities CpuFeatures_GetHardwareCapabilities(void) {
return kEmptyHardwareCapabilities; return kEmptyHardwareCapabilities;
} }
#endif #endif

View File

@@ -15,12 +15,12 @@
#include "internal/linux_features_aggregator.h" #include "internal/linux_features_aggregator.h"
#include "internal/string_view.h" #include "internal/string_view.h"
void SetFromFlags(const size_t configs_size, const CapabilityConfig* configs, void CpuFeatures_SetFromFlags(const size_t configs_size, const CapabilityConfig* configs,
const StringView flags_line, void* const features) { const StringView flags_line, void* const features) {
size_t i = 0; size_t i = 0;
for (; i < configs_size; ++i) { for (; i < configs_size; ++i) {
const CapabilityConfig config = configs[i]; const CapabilityConfig config = configs[i];
config.set_bit(features, HasWord(flags_line, config.proc_cpuinfo_flag)); config.set_bit(features, CpuFeatures_StringView_HasWord(flags_line, config.proc_cpuinfo_flag));
} }
} }
@@ -34,7 +34,7 @@ static bool IsHwCapsSet(const HardwareCapabilities hwcaps_mask,
IsSet(hwcaps_mask.hwcaps2, hwcaps.hwcaps2); IsSet(hwcaps_mask.hwcaps2, hwcaps.hwcaps2);
} }
void OverrideFromHwCaps(const size_t configs_size, void CpuFeatures_OverrideFromHwCaps(const size_t configs_size,
const CapabilityConfig* configs, const CapabilityConfig* configs,
const HardwareCapabilities hwcaps, const HardwareCapabilities hwcaps,
void* const features) { void* const features) {

View File

@@ -29,7 +29,7 @@ void StackLineReader_Initialize(StackLineReader* reader, int fd) {
// Replaces the content of buffer with bytes from the file. // Replaces the content of buffer with bytes from the file.
static int LoadFullBuffer(StackLineReader* reader) { static int LoadFullBuffer(StackLineReader* reader) {
const int read = const int read =
ReadFile(reader->fd, reader->buffer, STACK_LINE_READER_BUFFER_SIZE); CpuFeatures_ReadFile(reader->fd, reader->buffer, STACK_LINE_READER_BUFFER_SIZE);
assert(read >= 0); assert(read >= 0);
reader->view.ptr = reader->buffer; reader->view.ptr = reader->buffer;
reader->view.size = read; reader->view.size = read;
@@ -40,7 +40,7 @@ static int LoadFullBuffer(StackLineReader* reader) {
static int LoadMore(StackLineReader* reader) { static int LoadMore(StackLineReader* reader) {
char* const ptr = reader->buffer + reader->view.size; char* const ptr = reader->buffer + reader->view.size;
const size_t size_to_read = STACK_LINE_READER_BUFFER_SIZE - reader->view.size; const size_t size_to_read = STACK_LINE_READER_BUFFER_SIZE - reader->view.size;
const int read = ReadFile(reader->fd, ptr, size_to_read); const int read = CpuFeatures_ReadFile(reader->fd, ptr, size_to_read);
assert(read >= 0); assert(read >= 0);
assert(read <= (int)size_to_read); assert(read <= (int)size_to_read);
reader->view.size += read; reader->view.size += read;
@@ -48,7 +48,7 @@ static int LoadMore(StackLineReader* reader) {
} }
static int IndexOfEol(StackLineReader* reader) { static int IndexOfEol(StackLineReader* reader) {
return IndexOfChar(reader->view, '\n'); return CpuFeatures_StringView_IndexOfChar(reader->view, '\n');
} }
// Relocate buffer's pending bytes at the beginning of the array and fills the // Relocate buffer's pending bytes at the beginning of the array and fills the
@@ -71,7 +71,7 @@ static void SkipToNextLine(StackLineReader* reader) {
} else { } else {
const int eol_index = IndexOfEol(reader); const int eol_index = IndexOfEol(reader);
if (eol_index >= 0) { if (eol_index >= 0) {
reader->view = PopFront(reader->view, eol_index + 1); reader->view = CpuFeatures_StringView_PopFront(reader->view, eol_index + 1);
break; break;
} }
} }
@@ -120,8 +120,8 @@ LineResult StackLineReader_NextLine(StackLineReader* reader) {
return CreateTruncatedLineResult(reader->view); return CreateTruncatedLineResult(reader->view);
} }
{ {
StringView line = KeepFront(reader->view, eol_index); StringView line = CpuFeatures_StringView_KeepFront(reader->view, eol_index);
reader->view = PopFront(reader->view, eol_index + 1); reader->view = CpuFeatures_StringView_PopFront(reader->view, eol_index + 1);
return CreateValidLineResult(line); return CreateValidLineResult(line);
} }
} }

View File

@@ -18,7 +18,7 @@
#include <ctype.h> #include <ctype.h>
#include <string.h> #include <string.h>
int IndexOfChar(const StringView view, char c) { int CpuFeatures_StringView_IndexOfChar(const StringView view, char c) {
if (view.ptr && view.size) { if (view.ptr && view.size) {
const char* const found = (const char*)memchr(view.ptr, c, view.size); const char* const found = (const char*)memchr(view.ptr, c, view.size);
if (found) { if (found) {
@@ -28,67 +28,67 @@ int IndexOfChar(const StringView view, char c) {
return -1; return -1;
} }
int IndexOf(const StringView view, const StringView sub_view) { int CpuFeatures_StringView_IndexOf(const StringView view, const StringView sub_view) {
if (sub_view.size) { if (sub_view.size) {
StringView remainder = view; StringView remainder = view;
while (remainder.size >= sub_view.size) { while (remainder.size >= sub_view.size) {
const int found_index = IndexOfChar(remainder, sub_view.ptr[0]); const int found_index = CpuFeatures_StringView_IndexOfChar(remainder, sub_view.ptr[0]);
if (found_index < 0) break; if (found_index < 0) break;
remainder = PopFront(remainder, found_index); remainder = CpuFeatures_StringView_PopFront(remainder, found_index);
if (StartsWith(remainder, sub_view)) { if (CpuFeatures_StringView_StartsWith(remainder, sub_view)) {
return remainder.ptr - view.ptr; return remainder.ptr - view.ptr;
} }
remainder = PopFront(remainder, 1); remainder = CpuFeatures_StringView_PopFront(remainder, 1);
} }
} }
return -1; return -1;
} }
bool IsEquals(const StringView a, const StringView b) { bool CpuFeatures_StringView_IsEquals(const StringView a, const StringView b) {
if (a.size == b.size) { if (a.size == b.size) {
return a.ptr == b.ptr || memcmp(a.ptr, b.ptr, b.size) == 0; return a.ptr == b.ptr || memcmp(a.ptr, b.ptr, b.size) == 0;
} }
return false; return false;
} }
bool StartsWith(const StringView a, const StringView b) { bool CpuFeatures_StringView_StartsWith(const StringView a, const StringView b) {
return a.ptr && b.ptr && b.size && a.size >= b.size return a.ptr && b.ptr && b.size && a.size >= b.size
? memcmp(a.ptr, b.ptr, b.size) == 0 ? memcmp(a.ptr, b.ptr, b.size) == 0
: false; : false;
} }
StringView PopFront(const StringView str_view, size_t count) { StringView CpuFeatures_StringView_PopFront(const StringView str_view, size_t count) {
if (count > str_view.size) { if (count > str_view.size) {
return kEmptyStringView; return kEmptyStringView;
} }
return view(str_view.ptr + count, str_view.size - count); return view(str_view.ptr + count, str_view.size - count);
} }
StringView PopBack(const StringView str_view, size_t count) { StringView CpuFeatures_StringView_PopBack(const StringView str_view, size_t count) {
if (count > str_view.size) { if (count > str_view.size) {
return kEmptyStringView; return kEmptyStringView;
} }
return view(str_view.ptr, str_view.size - count); return view(str_view.ptr, str_view.size - count);
} }
StringView KeepFront(const StringView str_view, size_t count) { StringView CpuFeatures_StringView_KeepFront(const StringView str_view, size_t count) {
return count <= str_view.size ? view(str_view.ptr, count) : str_view; return count <= str_view.size ? view(str_view.ptr, count) : str_view;
} }
char Front(const StringView view) { char CpuFeatures_StringView_Front(const StringView view) {
assert(view.size); assert(view.size);
assert(view.ptr); assert(view.ptr);
return view.ptr[0]; return view.ptr[0];
} }
char Back(const StringView view) { char CpuFeatures_StringView_Back(const StringView view) {
assert(view.size); assert(view.size);
return view.ptr[view.size - 1]; return view.ptr[view.size - 1];
} }
StringView TrimWhitespace(StringView view) { StringView CpuFeatures_StringView_TrimWhitespace(StringView view) {
while (view.size && isspace(Front(view))) view = PopFront(view, 1); while (view.size && isspace(CpuFeatures_StringView_Front(view))) view = CpuFeatures_StringView_PopFront(view, 1);
while (view.size && isspace(Back(view))) view = PopBack(view, 1); while (view.size && isspace(CpuFeatures_StringView_Back(view))) view = CpuFeatures_StringView_PopBack(view, 1);
return view; return view;
} }
@@ -103,19 +103,19 @@ static int HexValue(const char c) {
static int ParsePositiveNumberWithBase(const StringView view, int base) { static int ParsePositiveNumberWithBase(const StringView view, int base) {
int result = 0; int result = 0;
StringView remainder = view; StringView remainder = view;
for (; remainder.size; remainder = PopFront(remainder, 1)) { for (; remainder.size; remainder = CpuFeatures_StringView_PopFront(remainder, 1)) {
const int value = HexValue(Front(remainder)); const int value = HexValue(CpuFeatures_StringView_Front(remainder));
if (value < 0 || value >= base) return -1; if (value < 0 || value >= base) return -1;
result = (result * base) + value; result = (result * base) + value;
} }
return result; return result;
} }
int ParsePositiveNumber(const StringView view) { int CpuFeatures_StringView_ParsePositiveNumber(const StringView view) {
if (view.size) { if (view.size) {
const StringView hex_prefix = str("0x"); const StringView hex_prefix = str("0x");
if (StartsWith(view, hex_prefix)) { if (CpuFeatures_StringView_StartsWith(view, hex_prefix)) {
const StringView span_no_prefix = PopFront(view, hex_prefix.size); const StringView span_no_prefix = CpuFeatures_StringView_PopFront(view, hex_prefix.size);
return ParsePositiveNumberWithBase(span_no_prefix, 16); return ParsePositiveNumberWithBase(span_no_prefix, 16);
} }
return ParsePositiveNumberWithBase(view, 10); return ParsePositiveNumberWithBase(view, 10);
@@ -123,7 +123,7 @@ int ParsePositiveNumber(const StringView view) {
return -1; return -1;
} }
void CopyString(const StringView src, char* dst, size_t dst_size) { void CpuFeatures_StringView_CopyString(const StringView src, char* dst, size_t dst_size) {
if (dst_size > 0) { if (dst_size > 0) {
const size_t max_copy_size = dst_size - 1; const size_t max_copy_size = dst_size - 1;
const size_t copy_size = const size_t copy_size =
@@ -133,31 +133,31 @@ void CopyString(const StringView src, char* dst, size_t dst_size) {
} }
} }
bool HasWord(const StringView line, const char* const word_str) { bool CpuFeatures_StringView_HasWord(const StringView line, const char* const word_str) {
const StringView word = str(word_str); const StringView word = str(word_str);
StringView remainder = line; StringView remainder = line;
for (;;) { for (;;) {
const int index_of_word = IndexOf(remainder, word); const int index_of_word = CpuFeatures_StringView_IndexOf(remainder, word);
if (index_of_word < 0) { if (index_of_word < 0) {
return false; return false;
} else { } else {
const StringView before = KeepFront(line, index_of_word); const StringView before = CpuFeatures_StringView_KeepFront(line, index_of_word);
const StringView after = PopFront(line, index_of_word + word.size); const StringView after = CpuFeatures_StringView_PopFront(line, index_of_word + word.size);
const bool valid_before = before.size == 0 || Back(before) == ' '; const bool valid_before = before.size == 0 || CpuFeatures_StringView_Back(before) == ' ';
const bool valid_after = after.size == 0 || Front(after) == ' '; const bool valid_after = after.size == 0 || CpuFeatures_StringView_Front(after) == ' ';
if (valid_before && valid_after) return true; if (valid_before && valid_after) return true;
remainder = PopFront(remainder, index_of_word + word.size); remainder = CpuFeatures_StringView_PopFront(remainder, index_of_word + word.size);
} }
} }
return false; return false;
} }
bool GetAttributeKeyValue(const StringView line, StringView* key, bool CpuFeatures_StringView_GetAttributeKeyValue(const StringView line, StringView* key,
StringView* value) { StringView* value) {
const StringView sep = str(": "); const StringView sep = str(": ");
const int index_of_separator = IndexOf(line, sep); const int index_of_separator = CpuFeatures_StringView_IndexOf(line, sep);
if (index_of_separator < 0) return false; if (index_of_separator < 0) return false;
*value = TrimWhitespace(PopFront(line, index_of_separator + sep.size)); *value = CpuFeatures_StringView_TrimWhitespace(CpuFeatures_StringView_PopFront(line, index_of_separator + sep.size));
*key = TrimWhitespace(KeepFront(line, index_of_separator)); *key = CpuFeatures_StringView_TrimWhitespace(CpuFeatures_StringView_KeepFront(line, index_of_separator));
return true; return true;
} }