From d6c867ea507c5f6f9aee730bdcecee8f80a2feed Mon Sep 17 00:00:00 2001
From: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date: Mon, 22 Sep 1997 17:53:20 -0300
Subject: better way to cope with opcode variants

---
 lopcodes.h | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

(limited to 'lopcodes.h')

diff --git a/lopcodes.h b/lopcodes.h
index ccab6341..7ba79e25 100644
--- a/lopcodes.h
+++ b/lopcodes.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lopcodes.h,v 1.2 1997/09/19 18:40:32 roberto Exp roberto $
+** $Id: lopcodes.h,v 1.3 1997/09/19 21:17:52 roberto Exp roberto $
 ** Opcodes for Lua virtual machine
 ** See Copyright Notice in lua.h
 */
@@ -8,6 +8,13 @@
 #define lopcodes_h
 
 
+/*
+** NOTICE: variants of the same opcode (like PUSH0, PUSHBYTE, PUSHWORD) must
+** be consecutive: First, those with built-in parameters, then with byte
+** parameter and last with word parameter.
+*/
+
+
 typedef enum {
 /* name          parm    before          after           side effect
 -----------------------------------------------------------------------------*/
@@ -15,15 +22,19 @@ ENDCODE,
 
 PUSHNIL,/*		-		nil  */
 PUSHNILS,/*	b	-		nil_1...nil_b  */
+
 PUSH0,/*		-		0.0  */
 PUSH1,/*		-		1.0  */
 PUSH2,/*		-		2.0  */
 PUSHBYTE,/*	b	-		(float)b  */
 PUSHWORD,/*	w	-		(float)w  */
+
 PUSHCONSTANTB,/*b	-		CNST[b] */
 PUSHCONSTANT,/* w	-		CNST[w] */
+
 PUSHUPVALUE0,
 PUSHUPVALUE,/*	b	-		Closure[b] */
+
 PUSHLOCAL0,/*		-		LOC[0]  */
 PUSHLOCAL1,/*		-		LOC[1]  */
 PUSHLOCAL2,/*		-		LOC[2]  */
@@ -35,10 +46,15 @@ PUSHLOCAL7,/*		-		LOC[7]  */
 PUSHLOCAL8,/*		-		LOC[8]  */
 PUSHLOCAL9,/*		-		LOC[9]  */
 PUSHLOCAL,/*	b	-		LOC[b]  */
-PUSHGLOBALB,/*	b 	-		VAR[CNST[b]]  */
-PUSHGLOBAL,/*	w	-		VAR[CNST[w]]  */
+
+GETGLOBALB,/*	b 	-		VAR[CNST[b]]  */
+GETGLOBAL,/*	w	-		VAR[CNST[w]]  */
+
 GETTABLE,/*		i t		t[i]  */
+
+PUSHSELFB,/*	b	t		t t[CNST[b]]  */
 PUSHSELF,/*	w	t		t t[CNST[w]]  */
+
 CREATEARRAY,/*	w	-		newarray(size = w)  */
 
 SETLOCAL0,/*		x		-		LOC[0]=x  */
@@ -52,10 +68,13 @@ SETLOCAL7,/*		x		-		LOC[7]=x  */
 SETLOCAL8,/*		x		-		LOC[8]=x  */
 SETLOCAL9,/*		x		-		LOC[9]=x  */
 SETLOCAL,/*	b	x		-		LOC[b]=x  */
+
 SETGLOBALB,/*	b	x		-		VAR[CNST[b]]=x  */
 SETGLOBAL,/*	w	x		-		VAR[CNST[w]]=x  */
+
 SETTABLE0,/*		v i t		-		t[i]=v  */
 SETTABLE,/*	b	v a_b...a_1 i t	a_b...a_1 i t	t[i]=v  */
+
 SETLIST0,/*	b	v_b...v_1 t	-		t[i]=v_i  */
 SETLIST,/*	b c	v_b...v_1 t	-		t[i+c*FPF]=v_i  */
 SETMAP,/*	b	v_b k_b ...v_1 k_1 t	t	t[k_i]=v_i  */
@@ -82,10 +101,14 @@ UPJMP,/*	w	-		-		PC-=w  */
 IFFJMP,/*	w	x		-		(x==nil)? PC+=w  */
 IFFUPJMP,/*	w	x		-		(x==nil)? PC-=w  */
 
-CLOSURE,/*		f v_1...v_n	c(f) */
+CLOSUREB,/*	b	v_1...v_n	c(CNST[b]) */
+CLOSURE,/*	w	v_1...v_n	c(CNST[w]) */
+
 CALLFUNC,/*	b c	v_b...v_1 f	r_c...r_1	f(v1,...,v_b)  */
 RETCODE,/*	b	-		-  */
 SETLINE,/*	w	-		-		LINE=w  */
+POP1,/*			-		-		TOP-=1  */
+POP2,/*			-		-		TOP-=2  */
 POPS,/*		b	-		-		TOP-=b  */
 ARGS,/*		b	-		-		TOP=BASE+b  */
 VARARGS/*	b	v_x...v_1	{v_1...v_x;n=x}	TOP=BASE+b+1  */
-- 
cgit v1.2.3-55-g6feb