mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-24 17:27:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move ByteLoader back to simd-string.c in preparation for getting rid of it

Browse Source
This commit is contained in:
Kovid Goyal
2023-11-17 13:05:43 +05:30
parent 293ad34535
commit ba18c5a669
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kitty/simd-string.c
View File

@@ -20,6 +20,17 @@ _Pragma("clang diagnostic pop")
static bool has_sse4_2 = false, has_avx2 = false; static bool has_sse4_2 = false, has_avx2 = false;
// ByteLoader {{{ // ByteLoader {{{
#define BYTE_LOADER_T unsigned long long
typedef struct ByteLoader {
BYTE_LOADER_T m;
unsigned sz_of_next_load, digits_left, num_left;
const uint8_t *next_load_at;
} ByteLoader;
uint8_t byte_loader_peek(const ByteLoader *self);
void byte_loader_init(ByteLoader *self, const uint8_t *buf, unsigned int sz);
uint8_t byte_loader_next(ByteLoader *self);
uint8_t uint8_t
byte_loader_peek(const ByteLoader *self) { byte_loader_peek(const ByteLoader *self) {
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__

10
kitty/simd-string.h
View File

@@ -12,16 +12,6 @@
#include <stdalign.h> #include <stdalign.h>
#include "data-types.h" #include "data-types.h"
#define BYTE_LOADER_T unsigned long long
typedef struct ByteLoader {
BYTE_LOADER_T m;
unsigned sz_of_next_load, digits_left, num_left;
const uint8_t *next_load_at;
} ByteLoader;
uint8_t byte_loader_peek(const ByteLoader *self);
void byte_loader_init(ByteLoader *self, const uint8_t *buf, unsigned int sz);
uint8_t byte_loader_next(ByteLoader *self);
typedef void (*control_byte_callback)(void *data, uint8_t ch); typedef void (*control_byte_callback)(void *data, uint8_t ch);
typedef void (*output_chars_callback)(void *data, const uint32_t *chars, unsigned count); typedef void (*output_chars_callback)(void *data, const uint32_t *chars, unsigned count);

14
kitty/vt-parser.c
View File

@@ -207,7 +207,6 @@ typedef struct PS {
struct { size_t offset, sz, pending; } write; struct { size_t offset, sz, pending; } write;
alignas(BUF_EXTRA) uint8_t buf[BUF_SZ + BUF_EXTRA]; alignas(BUF_EXTRA) uint8_t buf[BUF_SZ + BUF_EXTRA];
} PS; } PS;
static_assert(offsetof(PS, buf) > sizeof(BYTE_LOADER_T), "There must be enough space before the buf[] array for aligned loads");
static void static void
reset_csi(ParsedCSI *csi) { reset_csi(ParsedCSI *csi) {
@@ -987,17 +986,16 @@ bool
parse_sgr(Screen *screen, const uint8_t *buf, unsigned int num, const char *report_name UNUSED, bool is_deccara) { parse_sgr(Screen *screen, const uint8_t *buf, unsigned int num, const char *report_name UNUSED, bool is_deccara) {
ParsedCSI csi = {.mult=1}; ParsedCSI csi = {.mult=1};
size_t pos = 0; size_t pos = 0;
RAII_ALLOC(uint8_t, _buf, malloc(num + 2 + 2*sizeof(BYTE_LOADER_T))); RAII_ALLOC(uint8_t, _buf, malloc(num + 3));
if (!_buf) return false; if (!_buf) return false;
uint8_t *safe_buf = _buf + sizeof(BYTE_LOADER_T); memcpy(_buf, buf, num);
memcpy(safe_buf, buf, num);
if (is_deccara) { if (is_deccara) {
safe_buf[num++] = '$'; safe_buf[num++] = 'r'; _buf[num++] = '$'; _buf[num++] = 'r';
} else { } else {
safe_buf[num++] = 'm'; _buf[num++] = 'm';
} }
safe_buf[num] = 0; _buf[num] = 0;
if (!csi_parse_loop((PS*)screen->vt_parser->state, &csi, safe_buf, &pos, num, 0)) return false; if (!csi_parse_loop((PS*)screen->vt_parser->state, &csi, _buf, &pos, num, 0)) return false;
return _parse_sgr((PS*)screen->vt_parser->state, &csi); return _parse_sgr((PS*)screen->vt_parser->state, &csi);
} }
#endif #endif