*** empty log message ***
This commit is contained in:
parent
d1c0760ec2
commit
b221b702d0
@ -1,17 +1,19 @@
|
|||||||
/*
|
/*
|
||||||
* $Id: interp.c,v 1.5 2005-08-15 16:03:57 bacon Exp $
|
* $Id: interp.c,v 1.6 2005-08-16 15:49:04 bacon Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <xp/stx/interp.h>
|
#include <xp/stx/interp.h>
|
||||||
#include <xp/stx/method.h>
|
#include <xp/stx/method.h>
|
||||||
#include <xp/stx/object.h>
|
#include <xp/stx/object.h>
|
||||||
#include <xp/stx/array.h>
|
#include <xp/stx/array.h>
|
||||||
|
#include <xp/bas/assert.h>
|
||||||
|
|
||||||
#define XP_STX_CONTEXT_SIZE 4
|
#define XP_STX_CONTEXT_SIZE 5
|
||||||
#define XP_STX_CONTEXT_STACK 0
|
#define XP_STX_CONTEXT_STACK 0
|
||||||
#define XP_STX_CONTEXT_STACK_TOP 1
|
#define XP_STX_CONTEXT_STACK_TOP 1
|
||||||
#define XP_STX_CONTEXT_METHOD 2
|
#define XP_STX_CONTEXT_METHOD 2
|
||||||
#define XP_STX_CONTEXT_IP 3
|
#define XP_STX_CONTEXT_RECEIVER 3
|
||||||
|
#define XP_STX_CONTEXT_IP 4
|
||||||
|
|
||||||
struct xp_stx_context_t
|
struct xp_stx_context_t
|
||||||
{
|
{
|
||||||
@ -19,12 +21,13 @@ struct xp_stx_context_t
|
|||||||
xp_word_t stack;
|
xp_word_t stack;
|
||||||
xp_word_t stack_top;
|
xp_word_t stack_top;
|
||||||
xp_word_t method;
|
xp_word_t method;
|
||||||
|
xp_word_t receiver;
|
||||||
xp_word_t ip;
|
xp_word_t ip;
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef struct xp_stx_context_t xp_stx_context_t;
|
typedef struct xp_stx_context_t xp_stx_context_t;
|
||||||
|
|
||||||
xp_word_t xp_stx_new_context (xp_stx_t* stx, xp_word_t method)
|
xp_word_t xp_stx_new_context (xp_stx_t* stx, xp_word_t method, xp_word_t receiver)
|
||||||
{
|
{
|
||||||
xp_word_t context;
|
xp_word_t context;
|
||||||
xp_stx_context_t* ctxobj;
|
xp_stx_context_t* ctxobj;
|
||||||
@ -37,11 +40,17 @@ xp_word_t xp_stx_new_context (xp_stx_t* stx, xp_word_t method)
|
|||||||
ctxobj->stack = xp_stx_new_array (stx, 256); /* TODO: initial stack size */
|
ctxobj->stack = xp_stx_new_array (stx, 256); /* TODO: initial stack size */
|
||||||
ctxobj->stack_top = XP_STX_TO_SMALLINT(0);
|
ctxobj->stack_top = XP_STX_TO_SMALLINT(0);
|
||||||
ctxobj->method = method;
|
ctxobj->method = method;
|
||||||
|
ctxobj->receiver = receiver;
|
||||||
ctxobj->ip = XP_STX_TO_SMALLINT(0);
|
ctxobj->ip = XP_STX_TO_SMALLINT(0);
|
||||||
|
|
||||||
return context;
|
return context;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int __push_receiver_variable (
|
||||||
|
xp_stx_t* stx, int index, xp_stx_context_t* ctxobj);
|
||||||
|
static int __push_temporary_variable (
|
||||||
|
xp_stx_t* stx, int index, xp_stx_context_t* ctxobj);
|
||||||
|
|
||||||
int xp_stx_interp (xp_stx_t* stx, xp_word_t context)
|
int xp_stx_interp (xp_stx_t* stx, xp_word_t context)
|
||||||
{
|
{
|
||||||
xp_stx_context_t* ctxobj;
|
xp_stx_context_t* ctxobj;
|
||||||
@ -69,8 +78,10 @@ int xp_stx_interp (xp_stx_t* stx, xp_word_t context)
|
|||||||
|
|
||||||
switch (what) {
|
switch (what) {
|
||||||
case 0: /* receiver variable */
|
case 0: /* receiver variable */
|
||||||
|
__push_receiver_variable (stx, index, ctxobj);
|
||||||
break;
|
break;
|
||||||
case 1: /* temporary variable */
|
case 1: /* temporary variable */
|
||||||
|
__push_temporary_variable (stx, index, ctxobj);
|
||||||
break;
|
break;
|
||||||
case 2: /* literal constant */
|
case 2: /* literal constant */
|
||||||
break;
|
break;
|
||||||
@ -94,3 +105,35 @@ int xp_stx_interp (xp_stx_t* stx, xp_word_t context)
|
|||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int __push_receiver_variable (
|
||||||
|
xp_stx_t* stx, int index, xp_stx_context_t* ctxobj)
|
||||||
|
{
|
||||||
|
xp_word_t* stack;
|
||||||
|
xp_word_t stack_top;
|
||||||
|
|
||||||
|
xp_assert (XP_STX_IS_WORD_OBJECT(stx, ctxobj->receiver));
|
||||||
|
|
||||||
|
stack_top = XP_STX_FROM_SMALLINT(ctxobj->stack_top);
|
||||||
|
stack = XP_STX_DATA(stx, ctxobj->stack);
|
||||||
|
stack[stack_top++] = XP_STX_WORD_AT(stx, ctxobj->receiver, index);
|
||||||
|
ctxobj->stack_top = XP_STX_TO_SMALLINT(stack_top);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int __push_temporary_variable (
|
||||||
|
xp_stx_t* stx, int index, xp_stx_context_t* ctxobj)
|
||||||
|
{
|
||||||
|
xp_word_t* stack;
|
||||||
|
xp_word_t stack_top;
|
||||||
|
|
||||||
|
xp_assert (XP_STX_IS_WORD_OBJECT(stx, ctxobj->receiver));
|
||||||
|
|
||||||
|
stack_top = XP_STX_FROM_SMALLINT(ctxobj->stack_top);
|
||||||
|
stack = XP_STX_DATA(stx, ctxobj->stack);
|
||||||
|
stack[stack_top++] = XP_STX_WORD_AT(stx, ctxobj->receiver, index);
|
||||||
|
ctxobj->stack_top = XP_STX_TO_SMALLINT(stack_top);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* $Id: method.h,v 1.2 2005-07-05 09:02:13 bacon Exp $
|
* $Id: method.h,v 1.3 2005-08-16 15:49:04 bacon Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _XP_STX_METHOD_H_
|
#ifndef _XP_STX_METHOD_H_
|
||||||
@ -18,6 +18,7 @@ struct xp_stx_method_t
|
|||||||
xp_word_t text;
|
xp_word_t text;
|
||||||
xp_word_t selector; /* is this necessary? */
|
xp_word_t selector; /* is this necessary? */
|
||||||
xp_word_t bytecodes;
|
xp_word_t bytecodes;
|
||||||
|
xp_word_t temporaries; /* number of temporaries required */
|
||||||
xp_word_t literals[1];
|
xp_word_t literals[1];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user