80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Changed the size_t's in cpu/808x/queue.c/h into uintptr_t's and made the fatal() use PRIuPTR.

Browse Source
This commit is contained in:
OBattler
2023-08-09 22:17:02 +02:00
parent b99c47de5c
commit 3ae3287f26
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/cpu/808x/queue.c
View File

@@ -42,12 +42,14 @@
/* TODO: Move to cpu.h so this can eventually be reused for 286+ as well. */
#define QUEUE_MAX 6
/* NOTE: When porting from Rust to C, please use uintptr_t and not size_t,
so it can be printed with PRIuPTR. */
typedef struct queue_t
{
size_t size;
size_t len;
size_t back;
size_t front;
uintptr_t size;
uintptr_t len;
uintptr_t back;
uintptr_t front;
uint8_t q[QUEUE_MAX];
uint16_t preload;
queue_delay_t delay;
@@ -74,19 +76,15 @@ queue_log(const char *fmt, ...)
#endif
void
queue_set_size(size_t size)
queue_set_size(uintptr_t size)
{
if (size > QUEUE_MAX)
#if (defined __amd64__ || defined _M_X64 || defined __aarch64__ || defined _M_ARM64)
fatal("Requested prefetch queue of %zu bytes is too big\n", size);
#else
fatal("Requested prefetch queue of %i bytes is too big\n", size);
#endif
fatal("Requested prefetch queue of %" PRIuPTR " bytes is too big\n", size);
queue.size = size;
}
size_t
uintptr_t
queue_get_len(void)
{
return queue.len;

4
src/cpu/808x/queue.h
View File

@@ -26,8 +26,8 @@ typedef enum queue_delay_t
#define FLAG_PRELOADED 0x8000
extern void queue_set_size(size_t size);
extern size_t queue_get_len(void);
extern void queue_set_size(uintptr_t size);
extern uintptr_t queue_get_len(void);
extern int queue_is_full(void);
extern uint16_t queue_get_preload(void);
extern int queue_has_preload(void);