simon/post-scarcity
1
0
Fork 0
Code Issues 18 Pull requests Projects Releases Packages Wiki Activity Actions

Still in progress. Nothing workds.

Browse source
This commit is contained in:
Simon Brooke 2026-04-21 14:43:09 +01:00
parent aa5b34368e
commit ef59563e25
14 changed files with 206 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/c/payloads/cons.c
View file

@ -26,11 +26,12 @@
* @brief allocate a cons cell with this car and this cdr, and return a pointer
* to it.
*
* @param car the pointer which should form the car of this cons cell;
* @param cdr the pointer which should form the cdr of this cons cell.
* (cons object object)
*
* @param frame_pointer a pointer to a stack frame.
* @return struct pso_pointer a pointer to the newly allocated cons cell.
*/
struct pso_pointer make_cons( struct pso_pointer frame_pointer ) {
struct pso_pointer cons( struct pso_pointer frame_pointer ) {
struct pso4 *frame = pointer_to_pso4( frame_pointer );
struct pso_pointer result = allocate( frame, CONSTAG, 2 );
@ -49,18 +50,28 @@ struct pso_pointer make_cons( struct pso_pointer frame_pointer ) {
/**
* @brief return the car of this cons cell.
*
* @param cons a pointer to the cell.
* (car cell)
*
* @param frame_pointer a pointer to a stack frame.
* @return the car of the indicated cell.
* @exception if the pointer does not indicate a cons cell.
*/
struct pso_pointer c_car( struct pso_pointer cons ) {
struct pso_pointer car( struct pso_pointer frame_pointer ) {
struct pso_pointer result = nil;
struct pso_pointer cons = fetch_arg( pointer_to_pso4( frame_pointer), 0);
struct pso2 *object = pointer_to_object( cons );
if ( consp( cons ) ) {
result = object->payload.cons.car;
}
// TODO: else throw an exception
} else {
result =
make_exception( make_frame( 2, frame_pointer,
c_string_to_lisp_string( frame_pointer, L"Invalid type for car" ),
make_cons(
make_cons( frame_pointer,
c_string_to_lisp_keyword( frame_pointer, L"type" ),
get_tag_string( cons )), nil)));
}
return result;
}
@ -68,14 +79,17 @@ struct pso_pointer c_car( struct pso_pointer cons ) {
/**
* @brief return the cdr of this cons (or other sequence) cell.
*
* @param cons a pointer to the cell.
* (cdr cell)
*
* @param frame_pointer a pointer to a stack frame.
* @return the cdr of the indicated cell.
* @exception if the pointer does not indicate a cons cell.
*/
struct pso_pointer c_cdr( struct pso4 *stack_pointer, struct pso_pointer p ) {
// todo: issue #21: must have stack frame passed in.
struct pso_pointer cdr( struct pso_pointer frame_pointer ) {
struct pso_pointer result = nil;
struct pso2 *object = pointer_to_object( p );
struct pso4 *sp = pointer_to_pso4(frame_pointer);
struct pso_pointer cons = fetch_arg(sp, 0);
struct pso2 *object = pointer_to_object( cons );
switch ( get_tag_value( p ) ) {
case CONSTV:
@ -88,15 +102,15 @@ struct pso_pointer c_cdr( struct pso4 *stack_pointer, struct pso_pointer p ) {
break;
default:
result =
make_exception( make_cons
( stack_pointer, c_string_to_lisp_string
( stack_pointer, L"Invalid type for cdr" ),
get_tag_string( p ) ), nil, nil, nil );
make_exception( make_frame( 2, frame_pointer,
c_string_to_lisp_string( frame_pointer, L"Invalid type for cdr" ),
make_cons(
make_cons( frame_pointer,
c_string_to_lisp_keyword( frame_pointer, L"type" ),
get_tag_string( cons )), nil)));
break;
}
// TODO: else throw an exception
return result;
}

9
src/c/payloads/cons.h
View file

@ -27,14 +27,11 @@ struct cons_payload {
struct pso_pointer cdr;
};
struct pso_pointer c_car( struct pso_pointer cons );
struct pso_pointer car( struct pso_pointer frame_pointer );
struct pso_pointer c_cdr( struct pso4 *stack_pointer,
struct pso_pointer cons );
struct pso_pointer cdr( struct pso_pointer frame_pointer );
// todo: issue #21: must have stack frame passed in.
struct pso_pointer make_cons( struct pso4 *stack_pointer,
struct pso_pointer car, struct pso_pointer cdr );
struct pso_pointer cons( struct pso_pointer frame_pointer );
struct pso_pointer destroy_cons( struct pso_pointer fp,
struct pso_pointer env );

13
src/c/payloads/exception.c
View file

@ -23,6 +23,8 @@
* @brief allocate an exception object, and, if successful, return a pointer
* to it.
*
* (exception message meta cause)
*
* Throwing an exception while generating an exception is meaningless. If
* allocation fails utterly (i.e. out of heap, out of page space) this will
* have to return `nil`, which might give rise to hard to trace bugs. But
@ -34,10 +36,13 @@
* or `nil`
* @param cause the exception that caused this exception to be `thrown`.
*/
struct pso_pointer make_exception( struct pso_pointer message,
struct pso_pointer frame,
struct pso_pointer meta,
struct pso_pointer cause ) {
struct pso_pointer make_exception( struct pso_pointer frame_pointer) {
struct pso4* frame = pointer_to_pso4( frame_pointer);
struct pso_pointer message = fetch_arg(frame, 0);
struct pso_pointer previous = frame->payload.stack_frame.previous;
struct pso_pointer meta = fetch_arg( frame, 1);
struct pso_pointer cause = fetch_arg( frame, 2);
struct pso_pointer result =
allocate( pointer_to_pso4( frame ), EXCEPTIONTAG, 3 );

6
src/c/payloads/function.h
View file

@ -37,8 +37,7 @@ struct function_payload {
* to the Lisp function are assumed to be loaded into the frame before
* invocation.
*/
struct pso_pointer ( *executable ) ( struct pso_pointer frame_pointer,
struct pso_pointer env );
struct pso_pointer ( *executable ) ( struct pso_pointer frame_pointer );
#else
/**
* pointer to a C function which takes an unmanaged pointer to a stack frame,
@ -47,8 +46,7 @@ struct function_payload {
* loaded into the frame before invocation.
*/
struct pso_pointer ( *executable ) ( struct pso4 * frame,
struct pso_pointer frame_pointer,
struct pso_pointer env );
struct pso_pointer frame_pointer );
#endif
};

144
src/c/payloads/stack.c
View file

@ -37,63 +37,63 @@
* passed to the Lisp function.
*/
struct pso_pointer make_frame( int arg_count, struct pso_pointer previous,
struct pso_pointer env, ... ) {
... ) {
va_list args;
va_start( args, env );
va_start( args, previous );
struct pso4 *frame = pointer_to_pso4( previous );
struct pso_pointer frame_pointer =
struct pso4 *prev_frame = pointer_to_pso4( previous );
struct pso_pointer new_pointer =
allocate( pointer_to_pso4( previous ), STACKTAG, 4 );
struct pso4* new_frame = pointer_to_pso4(new_pointer);
#ifdef DEBUG
debug_printf( DEBUG_ALLOC, 0,
L"\nAllocating stack frame with %d arguments at page %d, "
L"offset %d...\n",
arg_count, frame_pointer.page, frame_pointer.offset );
arg_count, new_pointer.page, new_pointer.offset );
#endif
frame->payload.stack_frame.previous = previous;
prev_frame->payload.stack_frame.previous = previous;
if ( stackp( previous ) ) {
struct pso4 *op = pointer_to_pso4( previous );
frame->payload.stack_frame.depth = op->payload.stack_frame.depth + 1;
frame->payload.stack_frame.env = op->payload.stack_frame.env;
new_frame->payload.stack_frame.depth = prev_frame->payload.stack_frame.depth + 1;
new_frame->payload.stack_frame.env = prev_frame->payload.stack_frame.env;
} else {
frame->payload.stack_frame.depth = 0;
new_frame->payload.stack_frame.depth = 0;
}
debug_printf( DEBUG_ALLOC, 1, L"depth is %d...\n",
frame->payload.stack_frame.depth );
new_frame->payload.stack_frame.depth );
int cursor = 0;
frame->payload.stack_frame.args = arg_count;
new_frame->payload.stack_frame.args = arg_count;
for ( ; cursor < arg_count && cursor < args_in_frame; cursor++ ) {
struct pso_pointer argument = va_arg( args, struct pso_pointer );
frame->payload.stack_frame.arg[cursor] = inc_ref( argument );
new_frame->payload.stack_frame.arg[cursor] = inc_ref( argument );
}
if ( cursor < arg_count ) {
struct pso_pointer more_args = nil;
for ( ; cursor < arg_count; cursor++ ) {
more_args =
make_cons( frame, va_arg( args, struct pso_pointer ),
make_cons( prev_frame, va_arg( args, struct pso_pointer ),
more_args );
}
frame->payload.stack_frame.more = c_reverse( more_args );
new_frame->payload.stack_frame.more = c_reverse( more_args );
} else {
for ( ; cursor < args_in_frame; cursor++ ) {
frame->payload.stack_frame.arg[cursor] = nil;
new_frame->payload.stack_frame.arg[cursor] = nil;
}
}
debug_printf( DEBUG_ALLOC, 1,
L"Allocation of frame at page %d, offset %d completed.\n",
frame_pointer.page, frame_pointer.offset );
L"Allocation of stack frame at page %d, offset %d completed.\n",
new_pointer.page, new_pointer.offset );
return frame_pointer;
return new_pointer;
}
/**
@ -115,59 +115,131 @@ struct pso_pointer make_frame_with_env( int arg_count,
va_list args;
va_start( args, env );
struct pso4 *frame = pointer_to_pso4( previous );
struct pso_pointer frame_pointer =
struct pso4 *prev_frame = pointer_to_pso4( previous );
struct pso_pointer new_pointer =
allocate( pointer_to_pso4( previous ), STACKTAG, 4 );
struct pso4* new_frame = pointer_to_pso4(new_pointer);
#ifdef DEBUG
debug_printf( DEBUG_ALLOC, 0,
L"\nAllocating stack frame with %d arguments at page %d, "
L"offset %d...\n",
arg_count, frame_pointer.page, frame_pointer.offset );
arg_count, new_pointer.page, new_pointer.offset );
#endif
frame->payload.stack_frame.previous = previous;
prev_frame->payload.stack_frame.previous = previous;
if ( stackp( previous ) ) {
struct pso4 *op = pointer_to_pso4( previous );
frame->payload.stack_frame.depth = op->payload.stack_frame.depth + 1;
frame->payload.stack_frame.env = env;
new_frame->payload.stack_frame.depth = prev_frame->payload.stack_frame.depth + 1;
new_frame->payload.stack_frame.env = env;
} else {
frame->payload.stack_frame.depth = 0;
new_frame->payload.stack_frame.depth = 0;
}
debug_printf( DEBUG_ALLOC, 1, L"depth is %d...\n",
frame->payload.stack_frame.depth );
new_frame->payload.stack_frame.depth );
int cursor = 0;
frame->payload.stack_frame.args = arg_count;
new_frame->payload.stack_frame.args = arg_count;
for ( ; cursor < arg_count && cursor < args_in_frame; cursor++ ) {
struct pso_pointer argument = va_arg( args, struct pso_pointer );
frame->payload.stack_frame.arg[cursor] = inc_ref( argument );
new_frame->payload.stack_frame.arg[cursor] = inc_ref( argument );
}
if ( cursor < arg_count ) {
struct pso_pointer more_args = nil;
for ( ; cursor < arg_count; cursor++ ) {
more_args =
make_cons( frame, va_arg( args, struct pso_pointer ),
make_cons( prev_frame, va_arg( args, struct pso_pointer ),
more_args );
}
frame->payload.stack_frame.more = c_reverse( more_args );
new_frame->payload.stack_frame.more = c_reverse( more_args );
} else {
for ( ; cursor < args_in_frame; cursor++ ) {
frame->payload.stack_frame.arg[cursor] = nil;
new_frame->payload.stack_frame.arg[cursor] = nil;
}
}
debug_printf( DEBUG_ALLOC, 1,
L"Allocation of frame at page %d, offset %d completed.\n",
frame_pointer.page, frame_pointer.offset );
L"Allocation of stack frame at page %d, offset %d completed.\n",
new_pointer.page, new_pointer.offset );
return frame_pointer;
return new_pointer;
}
/**
* @brief variant make_frame where arg values are available as a Lisp list,
* and an explicit (because modified) environment is to be passed..
*
* @param previous pointer to the previous stack frame.
* @param argvalues values for the arguments to be placed in the frame.
* @param end the environment to be linked in the new frame.
*
* @return pointer to the new frame.
*/
struct pso_pointer make_frame_with_arglist_and_env( struct pso_pointer previous, struct pso_pointer argvalues,
struct pso_pointer env) {
struct pso4 *prev_frame = pointer_to_pso4( previous );
struct pso_pointer new_pointer =
allocate( pointer_to_pso4( previous ), STACKTAG, 4 );
struct pso4* new_frame = pointer_to_pso4(new_pointer);
int arg_count = c_length(argvalues);
#ifdef DEBUG
debug_printf( DEBUG_ALLOC, 0,
L"\nAllocating stack frame with %d arguments at page %d, "
L"offset %d...\n",
arg_count, new_pointer.page, new_pointer.offset );
#endif
prev_frame->payload.stack_frame.previous = previous;
if ( stackp( previous ) ) {
new_frame->payload.stack_frame.depth = prev_frame->payload.stack_frame.depth + 1;
new_frame->payload.stack_frame.env = inc_ref( prev_frame->payload.stack_frame.env);
} else {
new_frame->payload.stack_frame.depth = 0;
}
debug_printf( DEBUG_ALLOC, 1, L"depth is %d...\n",
new_frame->payload.stack_frame.depth );
int cursor = 0;
new_frame->payload.stack_frame.args = arg_count;
for ( ; cursor < arg_count && cursor < args_in_frame; cursor++ ) {
new_frame->payload.stack_frame.arg[cursor] = inc_ref( make_frame( 1, previous, car(argvalues)));
argvalues = cdr( make_frame( 1, previous, argvalues));
}
if ( cursor < arg_count ) {
new_frame->payload.stack_frame.more = inc_ref( cursor);
} else {
for ( ; cursor < args_in_frame; cursor++ ) {
new_frame->payload.stack_frame.arg[cursor] = nil;
}
}
debug_printf( DEBUG_ALLOC, 1,
L"Allocation of stack frame at page %d, offset %d completed.\n",
new_pointer.page, new_pointer.offset );
return new_pointer;
}
/**
* @brief variant make_frame where arg values are available as a Lisp list.
*
* @param previous pointer to the previous stack frame.
* @param argvalues values for the arguments to be placed in the frame.
*
* @return pointer to the new frame.
*/
struct pso_pointer make_frame_with_arglist( struct pso_pointer previous, struct pso_pointer argvalues) {
return make_frame_with_arglist_and_env( previous, argvalues, pointer_to_pso4(previous)->payload.stack_frame.env);
}