1
0
mirror of https://github.com/Interlisp/maiko.git synced 2026-05-05 07:44:20 +00:00

Renames struct buf to struct buffer to match corresponding Lisp datatype name

This commit is contained in:
Nick Briggs
2025-07-19 23:19:19 -07:00
parent 0e2cda2328
commit b75e66d91c

View File

@@ -74,9 +74,12 @@
#define BucketIndex(n) min(integerlength(n), MAXBUCKETINDEX) #define BucketIndex(n) min(integerlength(n), MAXBUCKETINDEX)
#define FreeBlockChainN(n) ((POINTERMASK & *FreeBlockBuckets_word) + 2 * BucketIndex(n)) #define FreeBlockChainN(n) ((POINTERMASK & *FreeBlockBuckets_word) + 2 * BucketIndex(n))
/*
* Declaration of buffer must be identical layout to Lisp BUFFER datatype in PMAP.
*/
#ifndef BYTESWAP #ifndef BYTESWAP
#ifdef BIGVM #ifdef BIGVM
struct buf { struct buffer {
LispPTR filepage; LispPTR filepage;
LispPTR vmempage; LispPTR vmempage;
LispPTR buffernext; LispPTR buffernext;
@@ -87,7 +90,7 @@ struct buf {
unsigned sysnext : 28; unsigned sysnext : 28;
}; };
#else #else
struct buf { struct buffer {
LispPTR filepage; LispPTR filepage;
LispPTR vmempage; LispPTR vmempage;
LispPTR buffernext; LispPTR buffernext;
@@ -100,7 +103,7 @@ struct buf {
#endif /* BIGVM */ #endif /* BIGVM */
#else #else
#ifdef BIGVM #ifdef BIGVM
struct buf { struct buffer {
LispPTR filepage; LispPTR filepage;
LispPTR vmempage; LispPTR vmempage;
LispPTR buffernext; LispPTR buffernext;
@@ -111,7 +114,7 @@ struct buf {
unsigned noreference : 1; unsigned noreference : 1;
}; };
#else #else
struct buf { struct buffer {
LispPTR filepage; LispPTR filepage;
LispPTR vmempage; LispPTR vmempage;
LispPTR buffernext; LispPTR buffernext;
@@ -140,10 +143,10 @@ static int integerlength(unsigned int n) {
static LispPTR findptrsbuffer(LispPTR ptr) { static LispPTR findptrsbuffer(LispPTR ptr) {
LispPTR buf; LispPTR buf;
struct buf *buf_np; struct buffer *buf_np;
buf = *System_Buffer_List_word; buf = *System_Buffer_List_word;
while (buf != NIL) { while (buf != NIL) {
buf_np = (struct buf *)NativeAligned4FromLAddr(buf); buf_np = (struct buffer *)NativeAligned4FromLAddr(buf);
if (ptr == buf_np->vmempage) { if (ptr == buf_np->vmempage) {
return (buf); return (buf);
} }
@@ -165,11 +168,11 @@ static LispPTR findptrsbuffer(LispPTR ptr) {
LispPTR releasingvmempage(LispPTR ptr) { LispPTR releasingvmempage(LispPTR ptr) {
LispPTR buffer = findptrsbuffer(ptr); LispPTR buffer = findptrsbuffer(ptr);
struct buf *buffer_np; struct buffer *buffer_np;
if (buffer == NIL) return (NIL); /* Not in use, OK to reclaim it */ if (buffer == NIL) return (NIL); /* Not in use, OK to reclaim it */
buffer_np = (struct buf *)NativeAligned4FromLAddr(buffer); buffer_np = (struct buffer *)NativeAligned4FromLAddr(buffer);
buffer_np->noreference = T; /* Mark the buffer free to use ?? */ buffer_np->noreference = T; /* Mark the buffer free to use ?? */
return (ATOM_T); return (ATOM_T);
} }