Convert to use unsigned buffer

This commit is contained in:
Russell Gallop
2011-08-11 16:06:04 +01:00
parent ff035c8b08
commit 5f0a15d4dc
2 changed files with 11 additions and 12 deletions

View File

@@ -2,21 +2,21 @@
#include "queue.h"
// This presumes that the xc compiler will not re-use the mem passed to init_queue
void init_queue(queue *q, int arr[], int size) {
void init_queue(queue *q, unsigned arr[], int size) {
q->rdptr = 0;
q->wrptr = 0;
q->data = (intptr_t)arr;
q->data = (uintptr_t)arr;
q->size = size; // presume that size is power of two
q->mask = size - 1;
}
extern inline void enqueue(queue *q, int value) {
((int *)q->data)[q->wrptr & q->mask] = value;
extern inline void enqueue(queue *q, unsigned value) {
((unsigned *)q->data)[q->wrptr & q->mask] = value;
q->wrptr++;
}
extern inline int dequeue(queue *q) {
int retval = ((int *)q->data)[q->rdptr & q->mask];
extern inline unsigned dequeue(queue *q) {
unsigned retval = ((unsigned *)q->data)[q->rdptr & q->mask];
q->rdptr++;
return retval;
}
@@ -41,8 +41,7 @@ extern inline int space(queue *q) {
void dump(queue *q) {
for (int i = q->rdptr; i != q->wrptr; i++) {
printf("a[%d] = %d\n", i & q->mask, ((int *)q->data)[i & q->mask]);
printf("a[%d] = %d\n", i & q->mask, ((unsigned *)q->data)[i & q->mask]);
}
}

View File

@@ -5,16 +5,16 @@
#include <xccompat.h>
typedef struct queue {
intptr_t data;
uintptr_t data;
int rdptr; // Using absolute indices which count reads and writes so this needs to be considered when accessing.
int wrptr;
int size;
int mask;
} queue;
void init_queue(REFERENCE_PARAM(queue, q), int arr[], int size);
void enqueue(REFERENCE_PARAM(queue, q), int value);
int dequeue(REFERENCE_PARAM(queue, q));
void init_queue(REFERENCE_PARAM(queue, q), unsigned arr[], int size);
void enqueue(REFERENCE_PARAM(queue, q), unsigned value);
unsigned dequeue(REFERENCE_PARAM(queue, q));
int isempty(REFERENCE_PARAM(queue, q));
int isfull(REFERENCE_PARAM(queue, q));
int items(REFERENCE_PARAM(queue, q));