Author: leo
Date: Tue Oct 25 03:15:48 2005
New Revision: 9554
Removed:
trunk/include/parrot/regfuncs.h
Modified:
trunk/MANIFEST
trunk/include/parrot/parrot.h
trunk/include/parrot/register.h
trunk/src/register.c
Log:
Variable-sized reg frames 13 - remove regfuncs.h
* the header had just 6 prototypes
* move all over to register.h
Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST (original)
+++ trunk/MANIFEST Tue Oct 25 03:15:48 2005
@@ -774,7 +774,6 @@ include/parrot/pic.h
include/parrot/pmc.h [main]
include/parrot/pmc_freeze.h [main]
include/parrot/pobj.h [main]
-include/parrot/regfuncs.h [main]
include/parrot/register.h [main]
include/parrot/resources.h [main]
include/parrot/runops_cores.h [main]
Modified: trunk/include/parrot/parrot.h
==============================================================================
--- trunk/include/parrot/parrot.h (original)
+++ trunk/include/parrot/parrot.h Tue Oct 25 03:15:48 2005
@@ -258,7 +258,6 @@ typedef void (*funcptr_t)(void);
#include "parrot/vtable.h"
#include "parrot/stacks.h"
#include "parrot/register.h"
-#include "parrot/regfuncs.h"
#include "parrot/exceptions.h"
#include "parrot/warnings.h"
#include "parrot/memory.h"
Modified: trunk/include/parrot/register.h
==============================================================================
--- trunk/include/parrot/register.h (original)
+++ trunk/include/parrot/register.h Tue Oct 25 03:15:48 2005
@@ -14,7 +14,6 @@
#define PARROT_REGISTER_H_GUARD
#include "parrot/string.h"
-#include "parrot/enums.h"
struct IReg {
INTVAL registers[NUM_REGISTERS];
@@ -34,6 +33,14 @@ struct PReg {
struct Stack_Chunk;
+void Parrot_push_regs(Interp *);
+void Parrot_pop_regs(Interp *);
+
+void Parrot_clear_i(Interp *);
+void Parrot_clear_s(Interp *);
+void Parrot_clear_p(Interp *);
+void Parrot_clear_n(Interp *);
+
void setup_register_stacks(Interp*);
void mark_register_stack(Interp* interpreter,
struct Stack_Chunk* stack);
Modified: trunk/src/register.c
==============================================================================
--- trunk/src/register.c (original)
+++ trunk/src/register.c Tue Oct 25 03:15:48 2005
@@ -21,10 +21,6 @@ to the previous values and the allocated
=head2 Functions
-Note that the API header for this file is F<include/parrot/regfuncs.h>
-not F<include/parrot/register.h> - that contains the various registers
-and register frame stacks.
-
=over 4
=cut
@@ -55,7 +51,7 @@ Restore all registers from register stac
typedef struct {
Regs_ni old_bp_ni; /* restoreall just resets ptrs */
Regs_ps old_bp_ps;
- Regs_ps bp_ps; /* pushed regs need DOD marking */
+ Regs_ps bp_ps; /* pushed regs need DOD marking */
INTVAL n_regs_pmc;
INTVAL n_regs_str;
} save_regs_t;
@@ -90,9 +86,9 @@ Parrot_push_regs(Interp *interpreter)
size_nisp = size_nis + _SIZEOF_PMCS;
ptr = mem_sys_allocate(size_nisp);
memcpy(ptr, (char*)ctx->bp.regs_i - _SIZEOF_NUMS, size_nisp);
- save_r->bp_ps.regs_s = (void*) ((char*) ptr + size_nis);
- interpreter->ctx.bp.regs_i = ctx->bp.regs_i =
- (void*) ((char*) ptr + _SIZEOF_NUMS);
+ save_r->bp_ps.regs_s = (void*) ((char*) ptr + size_nis);
+ interpreter->ctx.bp.regs_i = ctx->bp.regs_i =
+ (void*) ((char*) ptr + _SIZEOF_NUMS);
interpreter->ctx.bp_ps = ctx->bp_ps = save_r->bp_ps;
chunk = *chunk_p;
PObj_bufstart(chunk) = ptr;
@@ -197,50 +193,11 @@ Parrot_clear_n(Interp *interpreter)
/*
-=item C<void
-Parrot_push_on_stack(void *thing, INTVAL size, INTVAL type)>
-
-Unimplemented at present.
-
-=cut
-
-*/
-
-void
-Parrot_push_on_stack(void *thing, INTVAL size, INTVAL type)
-{
- UNUSED(thing);
- UNUSED(size);
- UNUSED(type);
-}
-
-/*
-
-=item C<void
-Parrot_pop_off_stack(void *thing, INTVAL type)>
-
-Unimplemented at present.
-
-=cut
-
-*/
-
-void
-Parrot_pop_off_stack(void *thing, INTVAL type)
-{
- UNUSED(thing);
- UNUSED(type);
-}
-
-
-/*
-
=back
=head1 SEE ALSO
-F<include/parrot/register.h>, F<include/parrot/regfuncs.h>, and
-F<src/stack_common.c>
+F<include/parrot/register.h> and F<src/stack_common.c>
=cut
