diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-07 15:28:06 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-07 15:28:06 +0200 |
| commit | f7f0902f65b7693b8b3ebc3064b5ea188e614bf9 (patch) | |
| tree | 39e9d3d6d3533afff62c72044dea723e6c70a2c3 /runtime/vmop.h | |
| parent | 1a08fa5ded3087a3b60d87a20d25a4ec589eba21 (diff) | |
| parent | a6c743e5ec5d213d3aa6404553fe65d59f065799 (diff) | |
| download | rsyslog-f7f0902f65b7693b8b3ebc3064b5ea188e614bf9.tar.gz rsyslog-f7f0902f65b7693b8b3ebc3064b5ea188e614bf9.tar.bz2 rsyslog-f7f0902f65b7693b8b3ebc3064b5ea188e614bf9.zip | |
Merge branch 'nextmaster' into oracle
Diffstat (limited to 'runtime/vmop.h')
| -rw-r--r-- | runtime/vmop.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/runtime/vmop.h b/runtime/vmop.h index 938b08fd..67048c26 100644 --- a/runtime/vmop.h +++ b/runtime/vmop.h @@ -26,6 +26,7 @@ #define INCLUDED_VMOP_H #include "ctok_token.h" +#include "vmstk.h" #include "stringbuf.h" /* machine instructions types */ @@ -96,7 +97,8 @@ typedef struct vmop_s { BEGINobjInstance; /* Data to implement generic object - MUST be the first data element! */ opcode_t opcode; union { - var_t *pVar; /* for function call, this is the name (string) of function to be called */ + var_t *pVar; + prsf_t rsf; /* pointer to function for "call" instruction */ } operand; struct vmop_s *pNext; /* next operation or NULL, if end of program (logically this belongs to vmprg) */ } vmop_t; @@ -112,8 +114,13 @@ BEGINinterface(vmop) /* name must also be changed in ENDinterface macro! */ rsRetVal (*SetVar)(vmop_t *pThis, var_t *pVar); rsRetVal (*Opcode2Str)(vmop_t *pThis, uchar **ppName); rsRetVal (*Obj2Str)(vmop_t *pThis, cstr_t *pstr); + /* v2 */ + rsRetVal (*SetFunc)(vmop_t *pThis, cstr_t *pcsFuncName); ENDinterface(vmop) -#define vmopCURR_IF_VERSION 1 /* increment whenever you change the interface structure! */ +#define vmopCURR_IF_VERSION 2 /* increment whenever you change the interface structure! */ +/* interface changes, v1 -> v2 + * added SetFuct after existing function pointers -- rgerhards, 2009-04-06 + */ /* the remaining prototypes */ PROTOTYPEObj(vmop); |