From 6d95aaf3f30ace2714b75dbfdd27de41f1dc389f Mon Sep 17 00:00:00 2001 From: stephey <stephey> Date: Fri, 30 Jul 2010 00:38:26 +0000 Subject: [PATCH] Removed redudant code --- Robust/src/Runtime/oooJava/Queue_RCR.c | 7 ++----- Robust/src/Runtime/oooJava/Queue_RCR.h | 3 ++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Robust/src/Runtime/oooJava/Queue_RCR.c b/Robust/src/Runtime/oooJava/Queue_RCR.c index d43653b7..a8c03424 100644 --- a/Robust/src/Runtime/oooJava/Queue_RCR.c +++ b/Robust/src/Runtime/oooJava/Queue_RCR.c @@ -2,9 +2,6 @@ #include "stdlib.h" #include "stdio.h" -//2^14 =16384 = 0X4000 -#define SIZE 16384 - __thread struct RCRQueue myRCRQueue; void resetRCRQueue() @@ -23,7 +20,7 @@ int enqueueRCRQueue(void * ptr) { myRCRQueue.elements[myRCRQueue.head++] = ptr; - if(myRCRQueue.head & 0x4000) + if(myRCRQueue.head & SIZE) myRCRQueue.head = 0; return myRCRQueue.size++ == SIZE; @@ -34,7 +31,7 @@ void * dequeueRCRQueue() if(myRCRQueue.size) { void * ptr = myRCRQueue.elements[myRCRQueue.tail++]; - if(myRCRQueue.tail & 0x4000) + if(myRCRQueue.tail & SIZE) myRCRQueue.tail = 0; diff --git a/Robust/src/Runtime/oooJava/Queue_RCR.h b/Robust/src/Runtime/oooJava/Queue_RCR.h index c1a1fb87..5f1f059e 100644 --- a/Robust/src/Runtime/oooJava/Queue_RCR.h +++ b/Robust/src/Runtime/oooJava/Queue_RCR.h @@ -1,10 +1,11 @@ #ifndef QUEUE_RCR_H_ #define QUEUE_RCR_H_ +//NOTE: SIZE MUST BE A POWER OF TWO; +//SIZE is used as mask to check overflow #define SIZE 16384 struct RCRQueue { - //Size is a power of 2 void * elements[SIZE]; unsigned int head; unsigned int tail; -- 2.34.1