summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mesa/drivers/common/driverfuncs.c14
-rw-r--r--src/mesa/drivers/common/driverfuncs.h4
-rw-r--r--src/mesa/drivers/dri/swrast/swrast.c4
-rw-r--r--src/mesa/drivers/x11/xm_api.c4
-rw-r--r--src/mesa/main/config.h2
-rw-r--r--src/mesa/main/context.c2
-rw-r--r--src/mesa/main/extensions.c5
-rw-r--r--src/mesa/main/mtypes.h29
-rw-r--r--src/mesa/shader/arbprogram.c14
-rw-r--r--src/mesa/shader/lex.yy.c1943
-rw-r--r--src/mesa/shader/prog_execute.c49
-rw-r--r--src/mesa/shader/prog_instruction.h12
-rw-r--r--src/mesa/shader/program_lexer.l47
-rw-r--r--src/mesa/shader/program_parse.tab.c2485
-rw-r--r--src/mesa/shader/program_parse.tab.h188
-rw-r--r--src/mesa/shader/program_parse.y362
-rw-r--r--src/mesa/shader/program_parse_extra.c77
-rw-r--r--src/mesa/shader/program_parser.h40
18 files changed, 3099 insertions, 2182 deletions
diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 4d21b033f7..ad45764596 100644
--- a/src/mesa/drivers/common/driverfuncs.c
+++ b/src/mesa/drivers/common/driverfuncs.c
@@ -350,3 +350,17 @@ _mesa_init_driver_state(GLcontext *ctx)
ctx->Driver.DrawBuffer(ctx, ctx->Color.DrawBuffer[0]);
}
+
+
+void
+_mesa_init_native_program_limits(struct gl_program_constants *pc)
+{
+ pc->MaxNativeInstructions = pc->MaxInstructions;
+ pc->MaxNativeAluInstructions = pc->MaxAluInstructions;
+ pc->MaxNativeTexInstructions = pc->MaxTexInstructions;
+ pc->MaxNativeTexIndirections = pc->MaxTexIndirections;
+ pc->MaxNativeAttribs = pc->MaxAttribs;
+ pc->MaxNativeTemps = pc->MaxTemps;
+ pc->MaxNativeAddressRegs = pc->MaxAddressRegs;
+ pc->MaxNativeParameters = pc->MaxParameters;
+}
diff --git a/src/mesa/drivers/common/driverfuncs.h b/src/mesa/drivers/common/driverfuncs.h
index 4c90ed12f6..fe527d748f 100644
--- a/src/mesa/drivers/common/driverfuncs.h
+++ b/src/mesa/drivers/common/driverfuncs.h
@@ -34,4 +34,8 @@ extern void
_mesa_init_driver_state(GLcontext *ctx);
+/** Set native fields to value of non-native fields. */
+void
+_mesa_init_native_program_limits(struct gl_program_constants *pc);
+
#endif
diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c
index f4947daa06..821d54515a 100644
--- a/src/mesa/drivers/dri/swrast/swrast.c
+++ b/src/mesa/drivers/dri/swrast/swrast.c
@@ -115,6 +115,7 @@ const struct dri_extension card_extensions[] =
{ "GL_MESA_resize_buffers", GL_MESA_resize_buffers_functions },
{ "GL_NV_depth_clamp", NULL },
{ "GL_NV_vertex_program", GL_NV_vertex_program_functions },
+ { "GL_NV_vertex_program2_option", NULL },
{ "GL_NV_fragment_program", GL_NV_fragment_program_functions },
{ "GL_NV_fragment_program_option", NULL },
{ NULL, NULL }
@@ -651,6 +652,9 @@ driCreateNewContext(__DRIscreen *screen, const __DRIconfig *config,
_mesa_enable_2_0_extensions(mesaCtx);
_mesa_enable_2_1_extensions(mesaCtx);
+ _mesa_init_native_program_limits(&mesaCtx->Const.VertexProgram);
+ _mesa_init_native_program_limits(&mesaCtx->Const.FragmentProgram);
+
_mesa_meta_init(mesaCtx);
return ctx;
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index 79b058634c..23812a2c6a 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -1363,6 +1363,7 @@ const struct dri_extension card_extensions[] =
{ "GL_MESA_resize_buffers", GL_MESA_resize_buffers_functions },
{ "GL_NV_depth_clamp", NULL },
{ "GL_NV_vertex_program", GL_NV_vertex_program_functions },
+ { "GL_NV_vertex_program2_option", NULL },
{ "GL_NV_fragment_program", GL_NV_fragment_program_functions },
{ NULL, NULL }
};
@@ -1648,6 +1649,9 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
xmesa_register_swrast_functions( mesaCtx );
_swsetup_Wakeup(mesaCtx);
+ _mesa_init_native_program_limits(&mesaCtx->Const.VertexProgram);
+ _mesa_init_native_program_limits(&mesaCtx->Const.FragmentProgram);
+
_mesa_meta_init(mesaCtx);
return c;
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index 8a09efdb53..85c532e0e9 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -210,7 +210,7 @@
/** For GL_ARB_vertex_program */
/*@{*/
-#define MAX_VERTEX_PROGRAM_ADDRESS_REGS 1
+#define MAX_VERTEX_PROGRAM_ADDRESS_REGS MAX_PROGRAM_ADDRESS_REGS
#define MAX_VERTEX_PROGRAM_PARAMS MAX_UNIFORMS
/*@}*/
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 490b8f0f33..4364ab26ea 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -495,6 +495,8 @@ init_program_limits(GLenum type, struct gl_program_constants *prog)
prog->MaxNativeTemps = 0;
prog->MaxNativeAddressRegs = 0;
prog->MaxNativeParameters = 0;
+ prog->MaxExecInstructions = 0;
+ prog->MaxCallDepth = 0;
}
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 54cf37c5f4..72ba98b12f 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -175,6 +175,8 @@ static const struct {
{ ON, "GL_NV_texgen_reflection", F(NV_texgen_reflection) },
{ OFF, "GL_NV_vertex_program", F(NV_vertex_program) },
{ OFF, "GL_NV_vertex_program1_1", F(NV_vertex_program1_1) },
+ { OFF, "GL_NV_vertex_program2_option", F(NV_vertex_program2_option) },
+ { OFF, "GL_NV_vertex_program3", F(NV_vertex_program3) },
{ ON, "GL_OES_read_format", F(OES_read_format) },
{ OFF, "GL_SGI_color_matrix", F(SGI_color_matrix) },
{ OFF, "GL_SGI_color_table", F(SGI_color_table) },
@@ -313,6 +315,9 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
ctx->Extensions.NV_vertex_program = GL_TRUE;
ctx->Extensions.NV_vertex_program1_1 = GL_TRUE;
#endif
+#if FEATURE_ARB_vertex_program
+ ctx->Extensions.NV_vertex_program2_option = GL_TRUE;
+#endif
#if FEATURE_NV_fragment_program
ctx->Extensions.NV_fragment_program = GL_TRUE;
#endif
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 052fbaaaea..21eff85804 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2362,7 +2362,10 @@ struct gl_program_constants
GLuint MaxParameters;
GLuint MaxLocalParams;
GLuint MaxEnvParams;
- /* native/hardware limits */
+ /**
+ * \name native/hardware limits
+ */
+ /*@{*/
GLuint MaxNativeInstructions;
GLuint MaxNativeAluInstructions; /* fragment programs only, for now */
GLuint MaxNativeTexInstructions; /* fragment programs only, for now */
@@ -2371,6 +2374,28 @@ struct gl_program_constants
GLuint MaxNativeTemps;
GLuint MaxNativeAddressRegs; /* vertex program only, for now */
GLuint MaxNativeParameters;
+
+ /**
+ * Maximum number of instructions, including loops, that can be executed
+ *
+ * \note
+ * This field only needs a non-zero value if \c GL_NV_vertex_program2,
+ * \c GL_NV_vertex_program2_option, or \c GL_NV_fragment_program2 is
+ * supported.
+ */
+ GLuint MaxExecInstructions;
+
+ /**
+ * Maximum function call depth
+ *
+ * \note
+ * This field only needs a non-zero value if \c GL_NV_vertex_program2,
+ * \c GL_NV_vertex_program2_option, or \c GL_NV_fragment_program2 is
+ * supported.
+ */
+ GLuint MaxCallDepth;
+ /*@}*/
+
/* For shaders */
GLuint MaxUniformComponents;
};
@@ -2572,6 +2597,8 @@ struct gl_extensions
GLboolean NV_texture_rectangle;
GLboolean NV_vertex_program;
GLboolean NV_vertex_program1_1;
+ GLboolean NV_vertex_program2_option;
+ GLboolean NV_vertex_program3;
GLboolean OES_read_format;
GLboolean SGI_color_matrix;
GLboolean SGI_color_table;
diff --git a/src/mesa/shader/arbprogram.c b/src/mesa/shader/arbprogram.c
index 4d8cff0700..709b7b7f72 100644
--- a/src/mesa/shader/arbprogram.c
+++ b/src/mesa/shader/arbprogram.c
@@ -929,6 +929,20 @@ _mesa_GetProgramivARB(GLenum target, GLenum pname, GLint *params)
case GL_MAX_PROGRAM_ENV_PARAMETERS_ARB:
*params = limits->MaxEnvParams;
return;
+ case GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV:
+ if (target == GL_VERTEX_PROGRAM_ARB
+ && ctx->Extensions.NV_vertex_program2_option) {
+ *params = limits->MaxExecInstructions;
+ return;
+ }
+ break;
+ case GL_MAX_PROGRAM_CALL_DEPTH_NV:
+ if (target == GL_VERTEX_PROGRAM_ARB
+ && ctx->Extensions.NV_vertex_program2_option) {
+ *params = limits->MaxCallDepth;
+ return;
+ }
+ break;
case GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB:
/*
* XXX we may not really need a driver callback here.
diff --git a/src/mesa/shader/lex.yy.c b/src/mesa/shader/lex.yy.c
index 17843c2121..3a1a471845 100644
--- a/src/mesa/shader/lex.yy.c
+++ b/src/mesa/shader/lex.yy.c
@@ -158,7 +158,15 @@ typedef void* yyscan_t;
/* Size of default input buffer. */
#ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
#endif
/* The state buf must be large enough to hold one state per character in the main buffer.
@@ -349,8 +357,8 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
*yy_cp = '\0'; \
yyg->yy_c_buf_p = yy_cp;
-#define YY_NUM_RULES 170
-#define YY_END_OF_BUFFER 171
+#define YY_NUM_RULES 180
+#define YY_END_OF_BUFFER 181
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -358,101 +366,109 @@ struct yy_trans_info
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_accept[850] =
+static yyconst flex_int16_t yy_accept[916] =
{ 0,
- 0, 0, 171, 169, 167, 166, 169, 169, 139, 165,
- 141, 141, 141, 141, 139, 139, 139, 139, 139, 139,
- 139, 139, 139, 139, 139, 139, 139, 139, 139, 139,
- 139, 139, 139, 139, 139, 167, 0, 0, 168, 139,
- 0, 140, 142, 162, 162, 0, 0, 0, 0, 162,
- 0, 0, 0, 0, 0, 0, 0, 119, 163, 120,
- 121, 153, 153, 153, 153, 0, 141, 0, 127, 128,
- 129, 139, 139, 139, 139, 139, 139, 139, 139, 139,
- 139, 139, 139, 139, 139, 139, 139, 139, 139, 139,
- 139, 139, 139, 139, 139, 139, 139, 139, 139, 139,
-
- 139, 139, 139, 139, 139, 139, 139, 139, 139, 139,
- 139, 139, 139, 139, 139, 139, 139, 139, 139, 139,
- 139, 139, 139, 139, 139, 139, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 161, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 160, 160, 0, 0, 0,
+ 0, 0, 181, 179, 177, 176, 179, 179, 149, 175,
+ 151, 151, 151, 151, 149, 149, 149, 149, 149, 149,
+ 149, 149, 149, 149, 149, 149, 149, 149, 149, 149,
+ 149, 149, 149, 149, 149, 149, 177, 0, 0, 178,
+ 149, 0, 150, 152, 172, 172, 0, 0, 0, 0,
+ 172, 0, 0, 0, 0, 0, 0, 0, 129, 173,
+ 130, 131, 163, 163, 163, 163, 0, 151, 0, 137,
+ 138, 139, 149, 149, 149, 149, 149, 149, 149, 149,
+ 149, 149, 149, 149, 149, 149, 149, 149, 149, 149,
+ 149, 149, 149, 149, 149, 149, 149, 149, 149, 149,
+
+ 149, 149, 149, 149, 149, 149, 149, 149, 149, 149,
+ 149, 149, 149, 149, 149, 149, 149, 149, 149, 149,
+ 149, 149, 149, 149, 149, 149, 149, 149, 149, 149,
+ 149, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 171, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 170, 170, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 169, 169, 169, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 160, 160,
+ 160, 161, 161, 162, 153, 152, 153, 0, 154, 11,
+ 12, 149, 13, 14, 15, 149, 16, 17, 18, 19,
+
+ 149, 20, 21, 22, 23, 24, 25, 6, 26, 27,
+ 28, 29, 30, 32, 31, 33, 34, 35, 36, 37,
+ 38, 39, 149, 149, 149, 149, 149, 149, 46, 149,
+ 49, 48, 149, 47, 50, 51, 52, 53, 54, 55,
+ 56, 149, 57, 58, 59, 60, 61, 62, 63, 64,
+ 149, 65, 66, 67, 68, 69, 149, 149, 74, 75,
+ 149, 149, 149, 149, 149, 149, 0, 0, 0, 0,
+ 152, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 90, 91, 93, 0, 168, 0, 0, 0, 0,
+ 0, 0, 107, 0, 0, 0, 0, 0, 0, 0,
+
+ 0, 0, 0, 167, 166, 166, 119, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 157, 157, 158,
+ 159, 0, 155, 11, 11, 149, 12, 12, 12, 149,
+ 149, 149, 149, 149, 19, 19, 149, 140, 20, 20,
+ 149, 21, 21, 149, 22, 22, 149, 23, 23, 149,
+ 24, 24, 149, 25, 25, 149, 26, 26, 149, 28,
+ 28, 149, 29, 29, 149, 32, 32, 149, 31, 31,
+ 149, 34, 34, 149, 35, 35, 149, 36, 36, 149,
+ 37, 37, 149, 38, 38, 149, 39, 39, 149, 149,
+ 149, 149, 40, 149, 42, 149, 45, 46, 46, 149,
+
+ 149, 49, 48, 48, 149, 141, 50, 50, 149, 51,
+ 51, 149, 149, 53, 53, 149, 54, 54, 149, 55,
+ 55, 149, 56, 56, 149, 149, 57, 57, 149, 58,
+ 58, 149, 59, 59, 149, 60, 60, 149, 61, 62,
+ 62, 149, 63, 63, 149, 149, 10, 65, 149, 66,
+ 149, 67, 149, 68, 69, 149, 70, 149, 72, 149,
+ 74, 74, 149, 149, 149, 149, 149, 149, 149, 149,
+ 0, 174, 0, 0, 0, 83, 84, 0, 0, 0,
+ 0, 0, 0, 0, 95, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 159, 159, 159, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 150, 150, 150, 151, 151, 152, 143,
- 142, 143, 0, 144, 11, 12, 139, 13, 139, 139,
- 14, 15, 139, 16, 17, 18, 19, 20, 21, 6,
-
- 22, 23, 24, 25, 26, 28, 27, 29, 30, 31,
- 32, 33, 34, 35, 139, 139, 139, 139, 139, 40,
- 41, 139, 42, 43, 44, 45, 46, 47, 48, 139,
- 49, 50, 51, 52, 53, 54, 55, 139, 56, 57,
- 58, 59, 139, 139, 64, 65, 139, 139, 139, 139,
- 139, 139, 0, 0, 0, 0, 142, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 80, 81, 83,
- 0, 158, 0, 0, 0, 0, 0, 0, 97, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 157,
- 156, 156, 109, 0, 0, 0, 0, 0, 0, 0,
-
- 0, 0, 0, 147, 147, 148, 149, 0, 145, 11,
- 11, 139, 12, 12, 12, 139, 139, 139, 139, 139,
- 15, 15, 139, 130, 16, 16, 139, 17, 17, 139,
- 18, 18, 139, 19, 19, 139, 20, 20, 139, 21,
- 21, 139, 22, 22, 139, 24, 24, 139, 25, 25,
- 139, 28, 28, 139, 27, 27, 139, 30, 30, 139,
- 31, 31, 139, 32, 32, 139, 33, 33, 139, 34,
- 34, 139, 35, 35, 139, 139, 139, 139, 36, 139,
- 38, 139, 40, 40, 139, 41, 41, 139, 131, 42,
- 42, 139, 43, 43, 139, 139, 45, 45, 139, 46,
-
- 46, 139, 47, 47, 139, 48, 48, 139, 139, 49,
- 49, 139, 50, 50, 139, 51, 51, 139, 52, 52,
- 139, 53, 53, 139, 54, 54, 139, 139, 10, 56,
- 139, 57, 139, 58, 139, 59, 139, 60, 139, 62,
- 139, 64, 64, 139, 139, 139, 139, 139, 139, 139,
- 139, 0, 164, 0, 0, 0, 73, 74, 0, 0,
- 0, 0, 0, 0, 0, 85, 0, 0, 0, 0,
+
+ 0, 0, 0, 165, 0, 0, 0, 123, 0, 125,
+ 0, 0, 0, 0, 0, 0, 164, 156, 11, 149,
+ 12, 149, 149, 4, 149, 149, 149, 19, 149, 20,
+ 149, 21, 149, 22, 149, 23, 149, 24, 149, 25,
+ 149, 26, 149, 28, 149, 29, 149, 32, 149, 31,
+ 149, 34, 149, 35, 149, 36, 149, 37, 149, 38,
+ 149, 39, 149, 149, 149, 9, 41, 43, 46, 149,
+ 44, 49, 48, 149, 50, 149, 51, 149, 149, 53,
+ 149, 54, 149, 55, 149, 56, 149, 149, 57, 149,
+ 58, 149, 59, 149, 60, 149, 61, 62, 149, 63,
+
+ 149, 149, 65, 149, 66, 149, 67, 149, 68, 69,
+ 149, 70, 149, 71, 72, 149, 73, 74, 149, 149,
+ 149, 149, 149, 79, 149, 149, 0, 0, 0, 0,
+ 0, 85, 86, 0, 0, 0, 0, 94, 0, 0,
+ 98, 101, 0, 0, 0, 0, 0, 0, 0, 112,
+ 113, 0, 0, 0, 0, 118, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 149, 149, 149, 149,
+ 149, 149, 5, 149, 149, 149, 149, 149, 149, 149,
+ 149, 149, 149, 149, 149, 149, 149, 149, 149, 149,
+ 149, 149, 7, 8, 149, 149, 149, 149, 149, 149,
+
+ 149, 149, 149, 149, 149, 149, 149, 149, 149, 149,
+ 149, 149, 149, 149, 149, 70, 149, 71, 149, 72,
+ 149, 73, 149, 149, 149, 149, 149, 80, 149, 76,
+ 0, 0, 0, 0, 134, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 104, 0, 108, 109, 0, 111,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 155, 0, 0, 0, 113, 0,
- 115, 0, 0, 0, 0, 0, 0, 154, 146, 139,
-
- 139, 139, 4, 139, 139, 139, 139, 139, 139, 139,
- 139, 139, 139, 139, 139, 139, 139, 139, 139, 139,
- 139, 139, 139, 139, 139, 139, 9, 37, 39, 139,
- 139, 139, 139, 139, 139, 139, 139, 139, 139, 139,
- 139, 139, 139, 139, 139, 139, 139, 139, 139, 139,
- 60, 139, 61, 62, 139, 63, 139, 139, 139, 139,
- 139, 69, 139, 139, 0, 0, 0, 0, 0, 75,
- 76, 0, 0, 0, 0, 84, 0, 0, 88, 91,
- 0, 0, 0, 0, 0, 0, 0, 102, 103, 0,
- 0, 0, 0, 108, 0, 0, 0, 0, 0, 0,
-
- 0, 0, 0, 0, 139, 139, 139, 139, 139, 139,
- 5, 139, 139, 139, 139, 139, 139, 139, 139, 139,
- 139, 139, 139, 139, 139, 139, 139, 139, 139, 139,
- 7, 8, 139, 139, 139, 139, 139, 139, 139, 139,
- 139, 139, 139, 139, 139, 139, 139, 139, 139, 139,
- 139, 139, 139, 139, 61, 139, 139, 63, 139, 139,
- 139, 139, 139, 70, 139, 66, 0, 0, 0, 0,
- 124, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 94, 0, 98, 99, 0, 101, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 117, 118, 0, 0,
-
- 125, 11, 3, 12, 135, 136, 139, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 24, 25, 28, 27,
- 30, 31, 32, 33, 34, 35, 40, 41, 42, 43,
- 44, 45, 46, 47, 48, 139, 139, 139, 49, 50,
- 51, 52, 53, 54, 55, 56, 57, 58, 59, 139,
- 139, 139, 139, 64, 65, 139, 68, 126, 0, 0,
- 71, 0, 77, 0, 0, 0, 86, 0, 0, 0,
- 0, 0, 0, 100, 0, 0, 106, 93, 0, 0,
- 0, 0, 0, 0, 122, 0, 139, 132, 133, 139,
- 60, 139, 62, 139, 67, 0, 0, 0, 0, 79,
-
- 82, 87, 0, 0, 92, 0, 0, 0, 105, 0,
- 0, 0, 0, 114, 116, 0, 139, 139, 61, 63,
- 2, 1, 0, 78, 0, 90, 0, 96, 104, 0,
- 0, 111, 112, 123, 139, 134, 0, 89, 0, 107,
- 110, 139, 72, 95, 139, 139, 137, 138, 0
+ 127, 128, 0, 0, 135, 11, 3, 12, 145, 146,
+ 149, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 28, 29, 32, 31, 34, 35, 36, 37, 38, 39,
+ 46, 48, 50, 51, 52, 53, 54, 55, 56, 149,
+
+ 149, 149, 57, 58, 59, 60, 62, 63, 64, 65,
+ 66, 67, 69, 149, 71, 149, 149, 73, 149, 74,
+ 75, 149, 78, 136, 0, 0, 81, 0, 87, 0,
+ 0, 0, 96, 0, 0, 0, 0, 0, 0, 110,
+ 0, 0, 116, 103, 0, 0, 0, 0, 0, 0,
+ 132, 0, 149, 142, 143, 149, 70, 149, 72, 149,
+ 77, 0, 0, 0, 0, 89, 92, 97, 0, 0,
+ 102, 0, 0, 0, 115, 0, 0, 0, 0, 124,
+ 126, 0, 149, 149, 71, 73, 2, 1, 0, 88,
+ 0, 100, 0, 106, 114, 0, 0, 121, 122, 133,
+
+ 149, 144, 0, 99, 0, 117, 120, 149, 82, 105,
+ 149, 149, 147, 148, 0
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -498,357 +514,389 @@ static yyconst flex_int32_t yy_meta[68] =
2, 2, 2, 2, 2, 2, 2
} ;
-static yyconst flex_int16_t yy_base[853] =
+static yyconst flex_int16_t yy_base[919] =
{ 0,
- 0, 0, 1299, 1300, 66, 1300, 1293, 1294, 0, 69,
- 85, 128, 140, 152, 151, 58, 56, 63, 76, 1272,
- 158, 160, 39, 163, 173, 189, 52, 1265, 76, 1235,
- 1234, 1246, 1230, 1244, 1243, 105, 1272, 1284, 1300, 0,
- 225, 1300, 218, 160, 157, 20, 123, 66, 119, 192,
- 1244, 1230, 54, 162, 1228, 1240, 194, 1300, 200, 195,
- 98, 227, 196, 231, 235, 293, 305, 316, 1300, 1300,
- 1300, 1249, 1262, 1256, 223, 1245, 1248, 1244, 1259, 107,
- 298, 1241, 1255, 246, 1241, 1254, 1245, 1258, 1235, 1246,
- 1237, 182, 1238, 1229, 1238, 1229, 1228, 1229, 144, 1223,
-
- 1229, 1240, 1231, 1225, 1222, 1223, 1227, 289, 1236, 1223,
- 302, 1230, 1217, 1231, 1207, 65, 315, 276, 1227, 1226,
- 1202, 1187, 1182, 1199, 1175, 1180, 1206, 279, 1195, 293,
- 1190, 342, 299, 1192, 1173, 317, 1183, 1179, 1174, 207,
- 1180, 1166, 1182, 1179, 1170, 320, 324, 1172, 1161, 1175,
- 1178, 1160, 1175, 1162, 1159, 1166, 284, 1174, 227, 288,
- 327, 342, 345, 1151, 1168, 1169, 1162, 1144, 318, 1145,
- 1167, 1158, 330, 341, 345, 349, 353, 357, 361, 1300,
- 419, 430, 436, 442, 440, 441, 1191, 0, 1190, 1173,
- 1163, 443, 1183, 444, 451, 468, 470, 472, 471, 0,
-
- 496, 0, 497, 498, 0, 499, 500, 0, 524, 525,
- 526, 536, 537, 553, 1178, 1171, 1184, 354, 356, 561,
- 563, 1165, 564, 565, 1157, 580, 590, 591, 592, 1178,
- 593, 617, 618, 619, 629, 630, 1155, 1165, 330, 362,
- 419, 483, 445, 364, 646, 1153, 1145, 1144, 1129, 1129,
- 1128, 1127, 1170, 1142, 1130, 662, 669, 643, 1134, 487,
- 1131, 1125, 1125, 1119, 1132, 1132, 1117, 1300, 1300, 1132,
- 1120, 646, 1127, 135, 1124, 1130, 561, 1125, 1300, 1116,
- 1123, 1122, 1125, 1111, 1110, 1114, 1109, 448, 1114, 650,
- 653, 665, 1300, 1106, 1104, 1104, 1112, 1113, 1095, 670,
-
- 1100, 1106, 486, 579, 655, 661, 668, 726, 732, 1112,
- 682, 1119, 1110, 688, 730, 1117, 1116, 1109, 1123, 1113,
- 1104, 712, 1111, 0, 1102, 731, 1109, 1100, 733, 1107,
- 1098, 734, 1105, 1096, 736, 1103, 1094, 737, 1101, 1092,
- 738, 1099, 1090, 739, 1097, 1088, 740, 1095, 1086, 741,
- 1093, 1084, 742, 1091, 1082, 743, 1089, 1080, 744, 1087,
- 1078, 745, 1085, 1076, 746, 1083, 1074, 747, 1081, 1072,
- 748, 1079, 1070, 749, 1077, 1080, 1073, 1080, 0, 1073,
- 0, 1088, 1063, 750, 1070, 1061, 751, 1068, 0, 1059,
- 752, 1066, 1057, 755, 1064, 1063, 1054, 758, 1061, 1052,
-
- 776, 1059, 1050, 777, 1057, 1048, 779, 1055, 1058, 1045,
- 780, 1052, 1043, 782, 1050, 1041, 783, 1048, 1039, 784,
- 1046, 1037, 785, 1044, 1035, 786, 1042, 1041, 0, 1032,
- 1039, 1030, 1037, 1028, 1035, 1026, 1033, 787, 1032, 788,
- 1047, 1022, 789, 1029, 1028, 1006, 1000, 1005, 1011, 994,
- 1009, 424, 1300, 1008, 998, 1002, 1300, 1300, 992, 1001,
- 987, 1004, 987, 990, 984, 1300, 985, 984, 981, 988,
- 981, 989, 985, 995, 992, 974, 980, 987, 971, 970,
- 988, 970, 982, 981, 1300, 980, 970, 974, 1300, 961,
- 1300, 966, 966, 974, 957, 958, 968, 1300, 1300, 1000,
-
- 982, 998, 0, 798, 996, 996, 995, 994, 993, 992,
- 991, 990, 989, 988, 987, 986, 985, 984, 983, 982,
- 981, 980, 979, 978, 965, 958, 0, 0, 0, 975,
- 974, 973, 972, 971, 970, 969, 968, 967, 945, 965,
- 964, 963, 962, 961, 960, 959, 958, 957, 956, 955,
- 929, 936, 793, 927, 934, 794, 950, 949, 918, 921,
- 901, 0, 902, 895, 902, 901, 902, 894, 912, 1300,
- 1300, 894, 892, 902, 895, 1300, 890, 907, 516, 1300,
- 898, 882, 883, 892, 883, 882, 882, 1300, 881, 890,
- 880, 896, 893, 1300, 892, 890, 879, 880, 876, 868,
-
- 875, 870, 871, 866, 892, 892, 890, 904, 903, 898,
- 0, 886, 885, 884, 883, 882, 881, 880, 879, 878,
- 877, 876, 875, 874, 873, 872, 871, 870, 869, 868,
- 0, 0, 867, 866, 865, 864, 863, 862, 861, 860,
- 859, 804, 858, 857, 856, 855, 854, 853, 852, 851,
- 850, 849, 848, 865, 839, 846, 862, 836, 843, 841,
- 840, 818, 818, 0, 825, 0, 859, 858, 807, 825,
- 1300, 820, 815, 808, 804, 816, 806, 804, 800, 816,
- 807, 806, 1300, 1300, 809, 1300, 804, 797, 786, 797,
- 789, 793, 806, 801, 804, 786, 1300, 1300, 798, 787,
-
- 1300, 0, 0, 0, 0, 0, 826, 0, 0, 0,
+ 0, 0, 1453, 1454, 66, 1454, 1447, 1448, 0, 69,
+ 85, 128, 140, 152, 151, 1418, 58, 56, 63, 76,
+ 1425, 158, 160, 42, 172, 173, 190, 68, 1418, 80,
+ 1388, 1387, 1399, 1383, 1397, 1396, 105, 1425, 1437, 1454,
+ 0, 226, 1454, 219, 161, 193, 20, 123, 66, 119,
+ 195, 1397, 1383, 146, 163, 1381, 1393, 200, 1454, 202,
+ 245, 44, 232, 182, 239, 243, 301, 313, 324, 1454,
+ 1454, 1454, 1402, 1415, 1409, 314, 1398, 1415, 1404, 1399,
+ 1395, 1410, 106, 306, 1392, 1406, 169, 1392, 1405, 1396,
+ 1409, 1386, 1397, 1388, 202, 1389, 1380, 1389, 1380, 1379,
+
+ 1380, 144, 225, 1378, 233, 259, 1384, 1378, 1375, 1376,
+ 1380, 240, 1389, 1376, 297, 1383, 1380, 1369, 1383, 1359,
+ 119, 324, 252, 1379, 1378, 1354, 1339, 1334, 1351, 1327,
+ 1332, 1358, 288, 1347, 302, 1342, 352, 309, 1344, 1325,
+ 327, 1335, 1331, 1326, 241, 1332, 1318, 1334, 1331, 1322,
+ 313, 331, 1324, 1313, 1327, 1330, 1312, 1327, 1314, 1311,
+ 1318, 323, 1326, 207, 327, 345, 349, 353, 1303, 1320,
+ 1321, 1314, 1296, 338, 1297, 1319, 1310, 349, 353, 357,
+ 361, 365, 369, 373, 1454, 431, 442, 448, 454, 452,
+ 453, 1343, 0, 0, 1342, 1325, 0, 0, 1315, 455,
+
+ 1335, 456, 463, 480, 482, 484, 483, 0, 508, 0,
+ 509, 510, 0, 511, 512, 0, 536, 537, 538, 548,
+ 549, 565, 1330, 1323, 1336, 375, 364, 1335, 573, 1327,
+ 1331, 575, 1314, 0, 576, 577, 1306, 592, 602, 603,
+ 604, 1327, 605, 629, 630, 631, 1327, 641, 642, 1303,
+ 1313, 362, 431, 495, 1324, 521, 457, 372, 658, 1300,
+ 1292, 1291, 1276, 1276, 1275, 1274, 1317, 1289, 1277, 674,
+ 681, 655, 1281, 133, 1278, 1272, 1272, 1266, 1279, 1279,
+ 1264, 1454, 1454, 1279, 1267, 658, 1274, 512, 1271, 1277,
+ 573, 1272, 1454, 1263, 1270, 1269, 1272, 1258, 1257, 1261,
+
+ 1256, 297, 1261, 662, 665, 677, 1454, 1253, 1251, 1251,
+ 1259, 1260, 1242, 682, 1247, 1253, 444, 591, 667, 673,
+ 680, 738, 744, 701, 700, 1267, 750, 744, 745, 1266,
+ 1265, 1258, 1272, 1262, 756, 746, 1261, 0, 758, 752,
+ 1260, 761, 755, 1259, 764, 759, 1258, 768, 762, 1257,
+ 771, 765, 1256, 778, 766, 1255, 784, 772, 1254, 800,
+ 774, 1253, 806, 780, 1252, 812, 783, 1251, 816, 790,
+ 1250, 818, 796, 1249, 822, 802, 1248, 824, 820, 1247,
+ 829, 826, 1246, 835, 830, 1245, 839, 833, 1244, 1247,
+ 1240, 1247, 0, 1240, 0, 1255, 0, 844, 834, 1238,
+
+ 1254, 395, 858, 838, 1236, 0, 862, 840, 1235, 867,
+ 842, 1234, 1233, 876, 848, 1232, 880, 864, 1231, 882,
+ 866, 1230, 884, 870, 1229, 1232, 886, 883, 1227, 899,
+ 888, 1226, 902, 896, 1225, 905, 900, 1224, 437, 909,
+ 904, 1223, 920, 908, 1222, 1221, 0, 922, 1220, 924,
+ 1219, 928, 1218, 472, 937, 1217, 910, 1216, 918, 1231,
+ 942, 926, 1214, 1213, 1191, 1185, 1190, 1196, 1179, 1194,
+ 538, 1454, 1193, 1183, 1187, 1454, 1454, 1177, 1186, 1172,
+ 1189, 1172, 1175, 1169, 1454, 1170, 1169, 1166, 1173, 1166,
+ 1174, 1170, 1180, 1177, 1159, 1165, 1172, 1156, 1155, 1173,
+
+ 1155, 1167, 1166, 1454, 1165, 1155, 1159, 1454, 1146, 1454,
+ 1151, 1151, 1159, 1142, 1143, 1153, 1454, 1454, 1160, 1184,
+ 1158, 1165, 1181, 0, 943, 1179, 1179, 1153, 1177, 1151,
+ 1175, 1149, 1173, 1147, 1171, 1145, 1169, 1143, 1167, 1141,
+ 1165, 1139, 1163, 1137, 1161, 1135, 1159, 1133, 1157, 1131,
+ 1155, 1129, 1153, 1127, 1151, 1125, 1149, 1123, 1147, 1121,
+ 1145, 1119, 1143, 1130, 1123, 0, 0, 0, 1115, 1139,
+ 0, 0, 1113, 1137, 1111, 1135, 1109, 1133, 1132, 1106,
+ 1130, 1104, 1128, 1102, 1126, 1100, 1124, 1102, 1097, 1121,
+ 1095, 1119, 1093, 1117, 1091, 1115, 0, 1089, 1113, 1087,
+
+ 1111, 1110, 1084, 1108, 1082, 1106, 1080, 1104, 0, 1078,
+ 1102, 946, 1084, 940, 960, 1083, 944, 1074, 1098, 1097,
+ 1066, 1069, 1049, 0, 1050, 1043, 1050, 1049, 1050, 1042,
+ 1060, 1454, 1454, 1042, 1040, 1050, 1043, 1454, 1038, 1055,
+ 621, 1454, 1046, 1030, 1031, 1040, 1031, 1030, 1030, 1454,
+ 1029, 1038, 1028, 1044, 1041, 1454, 1040, 1038, 1027, 1028,
+ 1024, 1016, 1023, 1018, 1019, 1014, 1040, 1040, 1038, 1052,
+ 1051, 1046, 0, 1034, 1033, 1032, 1031, 1030, 1029, 1028,
+ 1027, 1026, 1025, 1024, 1023, 1022, 1021, 1020, 1019, 1018,
+ 1017, 1016, 0, 0, 1015, 1014, 1013, 1012, 1011, 1010,
+
+ 1009, 1008, 1007, 552, 1006, 1005, 1004, 1003, 1002, 1001,
+ 1000, 999, 998, 997, 996, 988, 1012, 962, 994, 985,
+ 1009, 964, 991, 989, 988, 966, 966, 0, 973, 0,
+ 1007, 1006, 955, 973, 1454, 968, 963, 956, 952, 958,
+ 947, 944, 940, 956, 947, 946, 1454, 1454, 949, 1454,
+ 944, 937, 926, 937, 929, 933, 946, 940, 942, 923,
+ 1454, 1454, 934, 923, 1454, 0, 0, 0, 0, 0,
+ 961, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 814, 813, 802, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 785,
- 798, 779, 792, 0, 0, 656, 0, 0, 706, 702,
- 1300, 649, 1300, 648, 648, 654, 1300, 637, 645, 610,
- 612, 608, 608, 1300, 572, 583, 1300, 1300, 577, 573,
- 560, 557, 542, 555, 1300, 539, 573, 0, 0, 572,
- 0, 555, 0, 546, 0, 562, 551, 495, 479, 1300,
-
- 1300, 1300, 481, 481, 1300, 480, 443, 31, 1300, 141,
- 166, 171, 186, 1300, 1300, 211, 236, 276, 0, 0,
- 1300, 1300, 290, 1300, 325, 1300, 346, 1300, 1300, 343,
- 341, 1300, 1300, 1300, 365, 0, 380, 1300, 371, 1300,
- 1300, 486, 1300, 1300, 451, 458, 0, 0, 1300, 836,
- 503, 839
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 949,
+
+ 947, 944, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 926, 901, 888, 868, 859, 882, 0,
+ 0, 803, 0, 0, 853, 833, 1454, 775, 1454, 774,
+ 763, 759, 1454, 716, 690, 673, 674, 668, 676, 1454,
+ 649, 660, 1454, 1454, 659, 649, 618, 606, 592, 605,
+ 1454, 579, 619, 0, 0, 613, 0, 595, 0, 579,
+ 0, 59, 94, 150, 162, 1454, 1454, 1454, 246, 256,
+ 1454, 273, 289, 332, 1454, 329, 346, 343, 351, 1454,
+ 1454, 443, 470, 483, 0, 0, 1454, 1454, 463, 1454,
+ 484, 1454, 492, 1454, 1454, 490, 487, 1454, 1454, 1454,
+
+ 520, 0, 510, 1454, 517, 1454, 1454, 600, 1454, 1454,
+ 573, 583, 0, 0, 1454, 1005, 602, 1008
} ;
-static yyconst flex_int16_t yy_def[853] =
+static yyconst flex_int16_t yy_def[919] =
{ 0,
- 849, 1, 849, 849, 849, 849, 849, 850, 851, 849,
- 849, 849, 849, 849, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 849, 849, 850, 849, 851,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 852, 849, 849, 849, 849,
- 849, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
-
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
-
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
-
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
-
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 851,
-
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
-
- 849, 849, 849, 849, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
-
- 849, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 851, 851, 851, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 851, 851, 851, 851,
- 851, 851, 851, 851, 851, 849, 849, 849, 849, 849,
-
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 851, 851, 851, 851,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 851, 851, 849, 849, 849, 849,
- 849, 851, 849, 849, 851, 851, 851, 851, 0, 849,
- 849, 849
+ 915, 1, 915, 915, 915, 915, 915, 916, 917, 915,
+ 915, 915, 915, 915, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 915, 915, 916, 915,
+ 917, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 918, 915, 915, 915,
+ 915, 915, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 917, 917, 917, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 917, 917, 917, 917, 917, 917, 917, 917,
+ 917, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 917, 917, 917, 917, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+
+ 917, 917, 915, 915, 915, 915, 915, 917, 915, 915,
+ 917, 917, 917, 917, 0, 915, 915, 915
} ;
-static yyconst flex_int16_t yy_nxt[1368] =
+static yyconst flex_int16_t yy_nxt[1522] =
{ 0,
4, 5, 6, 5, 7, 8, 9, 4, 10, 11,
- 12, 13, 14, 11, 11, 15, 9, 16, 17, 18,
- 19, 9, 9, 9, 20, 21, 22, 9, 23, 24,
- 9, 25, 26, 27, 28, 9, 9, 29, 9, 9,
- 9, 9, 9, 9, 9, 9, 30, 9, 9, 9,
- 9, 9, 9, 9, 9, 9, 31, 9, 32, 33,
- 34, 9, 35, 9, 9, 9, 9, 36, 96, 36,
- 41, 116, 137, 97, 80, 138, 829, 42, 43, 43,
- 43, 43, 43, 43, 77, 81, 78, 119, 82, 117,
- 83, 238, 79, 66, 67, 67, 67, 67, 67, 67,
-
- 84, 85, 239, 150, 68, 120, 36, 86, 36, 151,
- 44, 45, 46, 47, 48, 49, 50, 51, 52, 141,
- 142, 53, 54, 55, 56, 57, 58, 59, 60, 61,
- 68, 143, 62, 63, 64, 65, 66, 67, 67, 67,
- 67, 67, 67, 170, 194, 195, 69, 68, 66, 67,
- 67, 67, 67, 67, 67, 218, 171, 219, 70, 68,
- 66, 67, 67, 67, 67, 67, 67, 72, 139, 73,
- 71, 68, 140, 68, 144, 92, 74, 145, 98, 88,
- 467, 89, 75, 93, 76, 68, 90, 99, 94, 91,
- 101, 100, 102, 103, 95, 468, 830, 68, 136, 133,
-
- 210, 133, 133, 152, 133, 104, 105, 133, 106, 107,
- 108, 109, 110, 134, 111, 133, 112, 153, 133, 211,
- 135, 831, 113, 114, 154, 115, 41, 43, 43, 43,
- 43, 43, 43, 146, 147, 157, 832, 132, 165, 133,
- 166, 161, 162, 167, 168, 833, 158, 163, 188, 159,
- 133, 169, 160, 265, 189, 164, 834, 201, 133, 174,
- 173, 175, 176, 132, 835, 266, 128, 129, 46, 47,
- 48, 49, 172, 51, 52, 202, 285, 53, 54, 55,
- 56, 57, 58, 130, 60, 61, 286, 243, 131, 244,
- 173, 173, 173, 173, 177, 173, 173, 178, 179, 173,
-
- 173, 173, 181, 181, 181, 181, 181, 181, 228, 836,
- 196, 197, 182, 66, 67, 67, 67, 67, 67, 67,
- 198, 232, 229, 183, 68, 184, 184, 184, 184, 184,
- 184, 240, 134, 241, 255, 233, 282, 287, 182, 135,
- 258, 258, 283, 288, 242, 837, 258, 430, 164, 256,
- 68, 257, 257, 257, 257, 257, 257, 258, 258, 258,
- 261, 258, 258, 298, 258, 272, 258, 258, 258, 258,
- 431, 258, 381, 299, 258, 258, 379, 838, 258, 432,
- 440, 289, 258, 290, 258, 258, 291, 292, 380, 258,
- 382, 839, 258, 303, 303, 303, 303, 840, 441, 841,
-
- 258, 842, 433, 258, 303, 303, 303, 303, 304, 303,
- 303, 305, 306, 303, 303, 303, 303, 303, 303, 303,
- 307, 303, 303, 303, 303, 303, 303, 303, 43, 43,
- 43, 43, 43, 43, 843, 844, 434, 308, 132, 309,
- 309, 309, 309, 309, 309, 184, 184, 184, 184, 184,
- 184, 184, 184, 184, 184, 184, 184, 310, 313, 435,
- 321, 325, 311, 314, 132, 322, 326, 438, 328, 847,
- 565, 311, 315, 329, 322, 326, 848, 311, 314, 439,
- 312, 316, 329, 323, 327, 331, 566, 334, 340, 337,
- 332, 330, 335, 341, 338, 482, 845, 846, 483, 332,
-
- 436, 335, 341, 338, 40, 332, 828, 335, 333, 338,
- 336, 342, 339, 343, 346, 349, 352, 355, 344, 347,
- 350, 353, 356, 437, 827, 826, 825, 344, 347, 350,
- 353, 356, 455, 824, 347, 350, 345, 348, 351, 354,
- 357, 358, 361, 364, 823, 456, 359, 362, 365, 498,
- 498, 498, 498, 367, 370, 359, 362, 365, 368, 371,
- 822, 359, 362, 365, 360, 363, 366, 368, 371, 678,
- 373, 821, 679, 368, 371, 374, 369, 372, 383, 820,
- 386, 390, 393, 384, 374, 387, 391, 394, 819, 818,
- 374, 817, 384, 375, 387, 391, 394, 397, 816, 815,
-
- 814, 385, 398, 388, 392, 395, 471, 400, 403, 406,
- 410, 398, 401, 404, 407, 411, 813, 398, 812, 472,
- 399, 401, 404, 407, 411, 811, 810, 401, 404, 407,
- 402, 405, 408, 412, 413, 416, 419, 809, 808, 414,
- 417, 420, 498, 498, 498, 498, 422, 425, 414, 417,
- 420, 423, 426, 807, 414, 417, 420, 415, 418, 421,
- 423, 426, 806, 442, 805, 804, 423, 426, 443, 424,
- 427, 257, 257, 257, 257, 257, 257, 443, 257, 257,
- 257, 257, 257, 257, 453, 453, 444, 453, 453, 803,
- 453, 453, 453, 453, 453, 453, 802, 453, 801, 310,
-
- 453, 453, 800, 799, 453, 313, 485, 453, 453, 798,
- 797, 453, 453, 492, 796, 493, 795, 494, 499, 498,
- 498, 498, 312, 453, 498, 498, 498, 498, 316, 321,
- 495, 498, 498, 498, 498, 309, 309, 309, 309, 309,
- 309, 309, 309, 309, 309, 309, 309, 313, 325, 501,
- 328, 331, 323, 334, 337, 340, 343, 346, 349, 352,
- 355, 358, 361, 364, 367, 370, 373, 383, 386, 390,
- 316, 327, 393, 330, 333, 397, 336, 339, 342, 345,
- 348, 351, 354, 357, 360, 363, 366, 369, 372, 375,
- 385, 388, 392, 400, 403, 395, 406, 410, 399, 413,
-
- 416, 419, 422, 425, 551, 554, 442, 794, 608, 609,
- 655, 658, 793, 792, 736, 737, 402, 405, 791, 408,
- 412, 790, 415, 418, 421, 424, 427, 552, 555, 444,
- 610, 789, 788, 656, 659, 738, 38, 38, 38, 180,
- 180, 787, 786, 785, 784, 783, 782, 781, 780, 779,
- 778, 777, 776, 775, 774, 773, 772, 771, 770, 769,
- 768, 767, 766, 765, 764, 763, 762, 761, 760, 759,
- 758, 757, 756, 755, 754, 753, 659, 752, 751, 656,
- 750, 749, 748, 747, 746, 745, 744, 743, 742, 741,
- 740, 739, 735, 734, 733, 732, 731, 730, 729, 728,
-
- 727, 726, 725, 724, 723, 722, 721, 720, 719, 718,
- 717, 716, 715, 714, 713, 712, 711, 710, 709, 708,
- 707, 706, 705, 704, 703, 702, 701, 700, 699, 698,
- 697, 696, 695, 694, 693, 692, 691, 690, 689, 688,
- 687, 686, 685, 684, 683, 682, 681, 680, 677, 676,
- 675, 674, 673, 672, 671, 670, 669, 668, 667, 666,
- 665, 664, 663, 662, 661, 660, 657, 555, 654, 552,
- 653, 652, 651, 650, 649, 648, 647, 646, 645, 644,
- 643, 642, 641, 640, 639, 638, 637, 636, 635, 634,
- 633, 632, 631, 630, 629, 628, 627, 626, 625, 624,
-
- 623, 622, 621, 620, 619, 618, 617, 616, 615, 614,
- 613, 612, 611, 607, 606, 605, 604, 603, 602, 601,
- 600, 599, 598, 597, 596, 595, 594, 593, 592, 591,
- 590, 589, 588, 587, 586, 585, 584, 583, 582, 581,
- 580, 579, 578, 577, 576, 575, 574, 573, 572, 571,
- 570, 569, 568, 567, 564, 563, 562, 561, 560, 559,
- 558, 557, 444, 556, 553, 550, 437, 549, 435, 548,
- 433, 547, 431, 546, 545, 427, 544, 424, 543, 421,
- 542, 418, 541, 415, 540, 412, 539, 538, 408, 537,
- 405, 536, 402, 535, 399, 534, 533, 395, 532, 392,
-
- 531, 388, 530, 385, 529, 528, 527, 526, 525, 524,
- 375, 523, 372, 522, 369, 521, 366, 520, 363, 519,
- 360, 518, 357, 517, 354, 516, 351, 515, 348, 514,
- 345, 513, 342, 512, 339, 511, 336, 510, 333, 509,
- 330, 508, 327, 507, 323, 506, 505, 504, 503, 502,
- 316, 500, 312, 497, 496, 491, 490, 489, 488, 487,
- 486, 484, 481, 480, 479, 478, 477, 476, 475, 474,
- 473, 470, 469, 466, 465, 464, 463, 462, 461, 460,
- 459, 458, 457, 454, 289, 261, 452, 451, 450, 449,
- 448, 447, 446, 445, 429, 428, 409, 396, 389, 378,
-
- 377, 376, 324, 320, 319, 318, 317, 302, 301, 300,
- 297, 296, 295, 294, 293, 284, 281, 280, 279, 278,
- 277, 276, 275, 274, 273, 271, 270, 269, 268, 267,
- 264, 263, 262, 260, 259, 172, 254, 253, 252, 251,
- 250, 249, 248, 247, 246, 245, 237, 236, 235, 234,
- 231, 230, 227, 226, 225, 224, 223, 222, 221, 220,
- 217, 216, 215, 214, 213, 212, 209, 208, 207, 206,
- 205, 204, 203, 200, 199, 193, 192, 191, 190, 187,
- 186, 185, 156, 155, 149, 148, 39, 127, 126, 125,
- 124, 123, 122, 121, 118, 87, 39, 37, 849, 3,
-
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849
+ 12, 13, 14, 11, 11, 15, 16, 17, 18, 19,
+ 20, 9, 9, 9, 21, 22, 23, 9, 24, 25,
+ 9, 26, 27, 28, 29, 9, 9, 30, 9, 9,
+ 9, 9, 9, 9, 9, 9, 31, 9, 9, 9,
+ 9, 9, 9, 9, 9, 9, 32, 9, 33, 34,
+ 35, 9, 36, 9, 9, 9, 9, 37, 887, 37,
+ 42, 99, 142, 79, 83, 143, 100, 43, 44, 44,
+ 44, 44, 44, 44, 80, 84, 81, 121, 85, 175,
+ 86, 124, 82, 67, 68, 68, 68, 68, 68, 68,
+
+ 87, 88, 176, 888, 69, 122, 37, 89, 37, 125,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 146,
+ 147, 54, 55, 56, 57, 58, 59, 60, 61, 62,
+ 69, 148, 63, 64, 65, 66, 67, 68, 68, 68,
+ 68, 68, 68, 202, 203, 251, 70, 69, 67, 68,
+ 68, 68, 68, 68, 68, 226, 252, 227, 71, 69,
+ 67, 68, 68, 68, 68, 68, 68, 73, 144, 74,
+ 72, 69, 145, 69, 149, 95, 75, 150, 474, 91,
+ 209, 92, 76, 96, 77, 69, 93, 101, 97, 94,
+ 105, 475, 106, 107, 98, 155, 102, 69, 210, 889,
+
+ 103, 156, 138, 138, 157, 108, 104, 109, 138, 110,
+ 111, 112, 113, 114, 139, 115, 890, 116, 158, 138,
+ 218, 140, 117, 118, 119, 159, 120, 42, 44, 44,
+ 44, 44, 44, 44, 141, 138, 151, 152, 137, 219,
+ 138, 162, 138, 166, 167, 179, 178, 180, 181, 168,
+ 231, 138, 163, 138, 228, 164, 299, 169, 165, 240,
+ 138, 229, 232, 257, 137, 258, 300, 133, 134, 47,
+ 48, 49, 50, 241, 52, 53, 233, 177, 54, 55,
+ 56, 57, 58, 59, 135, 61, 62, 279, 170, 136,
+ 171, 891, 234, 172, 173, 178, 178, 178, 178, 280,
+
+ 892, 174, 182, 178, 178, 183, 184, 178, 178, 178,
+ 186, 186, 186, 186, 186, 186, 244, 893, 204, 205,
+ 187, 67, 68, 68, 68, 68, 68, 68, 206, 193,
+ 245, 188, 69, 189, 189, 189, 189, 189, 189, 194,
+ 253, 139, 254, 269, 501, 195, 187, 502, 140, 255,
+ 272, 272, 894, 256, 272, 272, 272, 169, 69, 270,
+ 272, 271, 271, 271, 271, 271, 271, 272, 272, 272,
+ 275, 272, 286, 272, 272, 296, 301, 895, 272, 448,
+ 395, 297, 302, 312, 896, 272, 272, 272, 459, 272,
+ 304, 272, 272, 313, 305, 306, 272, 393, 396, 303,
+
+ 272, 897, 449, 272, 572, 572, 460, 272, 898, 394,
+ 899, 272, 317, 317, 317, 317, 317, 317, 317, 317,
+ 318, 317, 317, 319, 320, 317, 317, 317, 317, 317,
+ 317, 317, 321, 317, 317, 317, 317, 317, 317, 317,
+ 44, 44, 44, 44, 44, 44, 597, 597, 450, 322,
+ 137, 323, 323, 323, 323, 323, 323, 189, 189, 189,
+ 189, 189, 189, 189, 189, 189, 189, 189, 189, 324,
+ 327, 451, 335, 339, 325, 328, 137, 336, 340, 457,
+ 342, 609, 609, 325, 329, 343, 336, 340, 900, 325,
+ 328, 458, 326, 330, 343, 337, 341, 345, 901, 348,
+
+ 354, 351, 346, 344, 349, 355, 352, 517, 517, 517,
+ 517, 346, 452, 349, 355, 352, 902, 346, 903, 349,
+ 347, 352, 350, 356, 353, 357, 360, 363, 366, 369,
+ 358, 361, 364, 367, 370, 453, 904, 905, 455, 358,
+ 361, 364, 367, 370, 906, 907, 361, 364, 359, 362,
+ 365, 368, 371, 372, 375, 378, 908, 486, 373, 376,
+ 379, 456, 800, 801, 909, 381, 384, 373, 376, 379,
+ 382, 385, 487, 373, 376, 379, 374, 377, 380, 382,
+ 385, 910, 387, 802, 627, 382, 385, 388, 383, 386,
+ 398, 913, 403, 407, 410, 399, 388, 404, 408, 411,
+
+ 628, 914, 388, 41, 399, 389, 404, 408, 411, 414,
+ 911, 912, 886, 400, 415, 405, 409, 412, 490, 417,
+ 420, 423, 427, 415, 418, 421, 424, 428, 885, 415,
+ 884, 491, 416, 418, 421, 424, 428, 883, 882, 418,
+ 421, 424, 419, 422, 425, 429, 430, 433, 436, 881,
+ 880, 431, 434, 437, 517, 517, 517, 517, 440, 443,
+ 431, 434, 437, 441, 444, 879, 431, 434, 437, 432,
+ 435, 438, 441, 444, 742, 461, 878, 743, 441, 444,
+ 462, 442, 445, 271, 271, 271, 271, 271, 271, 462,
+ 271, 271, 271, 271, 271, 271, 472, 472, 463, 472,
+
+ 472, 877, 472, 472, 472, 472, 472, 472, 876, 472,
+ 519, 519, 472, 472, 875, 874, 472, 324, 504, 472,
+ 472, 873, 872, 472, 472, 511, 871, 512, 870, 513,
+ 518, 517, 517, 517, 869, 472, 517, 517, 517, 517,
+ 326, 326, 514, 517, 517, 517, 517, 323, 323, 323,
+ 323, 323, 323, 323, 323, 323, 323, 323, 323, 521,
+ 521, 327, 327, 335, 522, 528, 528, 530, 530, 339,
+ 532, 532, 342, 534, 534, 868, 345, 536, 536, 348,
+ 538, 538, 351, 354, 330, 330, 337, 540, 540, 357,
+ 330, 360, 341, 542, 542, 344, 337, 363, 341, 347,
+
+ 366, 344, 350, 867, 347, 353, 356, 369, 350, 544,
+ 544, 353, 359, 372, 362, 546, 546, 866, 356, 375,
+ 365, 548, 548, 368, 359, 550, 550, 552, 552, 865,
+ 371, 554, 554, 556, 556, 864, 374, 378, 558, 558,
+ 362, 863, 377, 381, 560, 560, 365, 384, 562, 562,
+ 387, 398, 368, 569, 569, 403, 371, 407, 374, 410,
+ 380, 862, 377, 861, 380, 414, 383, 573, 573, 383,
+ 386, 575, 575, 389, 400, 386, 577, 577, 405, 389,
+ 409, 417, 412, 420, 400, 580, 580, 423, 416, 582,
+ 582, 584, 584, 586, 586, 589, 589, 860, 405, 723,
+
+ 427, 859, 409, 858, 419, 430, 422, 412, 591, 591,
+ 425, 593, 593, 433, 595, 595, 416, 436, 598, 598,
+ 419, 440, 422, 429, 425, 443, 429, 612, 432, 600,
+ 600, 603, 603, 605, 605, 615, 435, 607, 607, 432,
+ 438, 719, 435, 461, 442, 438, 610, 610, 445, 442,
+ 613, 618, 618, 670, 671, 716, 716, 718, 616, 857,
+ 445, 722, 449, 856, 451, 855, 463, 854, 453, 720,
+ 720, 815, 815, 818, 818, 672, 853, 456, 852, 851,
+ 719, 850, 463, 849, 723, 848, 613, 847, 846, 845,
+ 844, 843, 842, 841, 840, 839, 838, 837, 836, 835,
+
+ 616, 834, 719, 833, 723, 39, 39, 39, 185, 185,
+ 832, 831, 830, 829, 828, 827, 826, 825, 824, 823,
+ 822, 821, 820, 819, 817, 616, 816, 814, 613, 813,
+ 812, 811, 810, 809, 808, 807, 806, 805, 804, 803,
+ 799, 798, 797, 796, 795, 794, 793, 792, 791, 790,
+ 789, 788, 787, 786, 785, 784, 783, 782, 781, 780,
+ 779, 778, 777, 776, 775, 774, 773, 772, 771, 770,
+ 769, 768, 767, 766, 765, 764, 763, 762, 761, 760,
+ 759, 758, 757, 756, 755, 754, 753, 752, 751, 750,
+ 749, 748, 747, 746, 745, 744, 741, 740, 739, 738,
+
+ 737, 736, 735, 734, 733, 732, 731, 730, 729, 728,
+ 727, 726, 725, 724, 463, 721, 717, 715, 456, 714,
+ 453, 713, 451, 712, 449, 711, 710, 445, 709, 442,
+ 708, 438, 707, 435, 706, 432, 705, 429, 704, 703,
+ 425, 702, 422, 701, 419, 700, 416, 699, 698, 412,
+ 697, 409, 696, 405, 695, 400, 694, 693, 692, 389,
+ 691, 386, 690, 383, 689, 380, 688, 377, 687, 374,
+ 686, 371, 685, 368, 684, 365, 683, 362, 682, 359,
+ 681, 356, 680, 353, 679, 350, 678, 347, 677, 344,
+ 676, 341, 675, 337, 674, 673, 669, 668, 330, 667,
+
+ 326, 666, 665, 664, 663, 662, 661, 660, 659, 658,
+ 657, 656, 655, 654, 653, 652, 651, 650, 649, 648,
+ 647, 646, 645, 644, 643, 642, 641, 640, 639, 638,
+ 637, 636, 635, 634, 633, 632, 631, 630, 629, 626,
+ 625, 624, 623, 622, 621, 620, 619, 617, 614, 611,
+ 608, 606, 604, 602, 601, 599, 596, 594, 592, 590,
+ 588, 587, 585, 583, 581, 579, 578, 576, 574, 571,
+ 570, 568, 567, 566, 565, 564, 563, 561, 559, 557,
+ 555, 553, 551, 549, 547, 545, 543, 541, 539, 537,
+ 535, 533, 531, 529, 527, 526, 525, 524, 523, 520,
+
+ 516, 515, 510, 509, 508, 507, 506, 505, 503, 500,
+ 499, 498, 497, 496, 495, 494, 493, 492, 489, 488,
+ 485, 484, 483, 482, 481, 480, 479, 478, 477, 476,
+ 473, 303, 275, 471, 470, 469, 468, 467, 466, 465,
+ 464, 454, 447, 446, 439, 426, 413, 406, 402, 401,
+ 397, 392, 391, 390, 338, 334, 333, 332, 331, 316,
+ 315, 314, 311, 310, 309, 308, 307, 298, 295, 294,
+ 293, 292, 291, 290, 289, 288, 287, 285, 284, 283,
+ 282, 281, 278, 277, 276, 274, 273, 177, 268, 267,
+ 266, 265, 264, 263, 262, 261, 260, 259, 250, 249,
+
+ 248, 247, 246, 243, 242, 239, 238, 237, 236, 235,
+ 230, 225, 224, 223, 222, 221, 220, 217, 216, 215,
+ 214, 213, 212, 211, 208, 207, 201, 200, 199, 198,
+ 197, 196, 192, 191, 190, 161, 160, 154, 153, 40,
+ 132, 131, 130, 129, 128, 127, 126, 123, 90, 78,
+ 40, 38, 915, 3, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915
} ;
-static yyconst flex_int16_t yy_chk[1368] =
+static yyconst flex_int16_t yy_chk[1522] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -856,150 +904,168 @@ static yyconst flex_int16_t yy_chk[1368] =
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 5, 23, 5,
- 10, 27, 46, 23, 17, 46, 808, 10, 10, 10,
- 10, 10, 10, 10, 16, 17, 16, 29, 17, 27,
- 18, 116, 16, 11, 11, 11, 11, 11, 11, 11,
-
- 18, 19, 116, 53, 11, 29, 36, 19, 36, 53,
- 10, 10, 10, 10, 10, 10, 10, 10, 10, 48,
- 48, 10, 10, 10, 10, 10, 10, 10, 10, 10,
- 11, 48, 10, 10, 10, 10, 12, 12, 12, 12,
- 12, 12, 12, 61, 80, 80, 12, 12, 13, 13,
- 13, 13, 13, 13, 13, 99, 61, 99, 13, 13,
- 14, 14, 14, 14, 14, 14, 14, 15, 47, 15,
- 14, 14, 47, 12, 49, 22, 15, 49, 24, 21,
- 274, 21, 15, 22, 15, 13, 21, 24, 22, 21,
- 25, 24, 25, 25, 22, 274, 810, 14, 45, 45,
-
- 92, 44, 44, 54, 45, 25, 26, 44, 26, 26,
- 26, 26, 26, 44, 26, 45, 26, 54, 44, 92,
- 44, 811, 26, 26, 54, 26, 41, 43, 43, 43,
- 43, 43, 43, 50, 50, 57, 812, 43, 60, 50,
- 60, 59, 59, 60, 60, 813, 57, 59, 75, 57,
- 50, 60, 57, 140, 75, 59, 816, 84, 59, 63,
- 63, 63, 63, 43, 817, 140, 41, 41, 41, 41,
- 41, 41, 62, 41, 41, 84, 159, 41, 41, 41,
- 41, 41, 41, 41, 41, 41, 159, 118, 41, 118,
- 62, 62, 62, 62, 64, 64, 64, 64, 65, 65,
-
- 65, 65, 66, 66, 66, 66, 66, 66, 108, 818,
- 81, 81, 66, 67, 67, 67, 67, 67, 67, 67,
- 81, 111, 108, 68, 67, 68, 68, 68, 68, 68,
- 68, 117, 128, 117, 130, 111, 157, 160, 66, 128,
- 133, 133, 157, 160, 117, 823, 133, 239, 130, 132,
- 67, 132, 132, 132, 132, 132, 132, 133, 136, 136,
- 136, 146, 146, 169, 136, 147, 147, 146, 161, 161,
- 239, 147, 219, 169, 161, 136, 218, 825, 146, 240,
- 244, 161, 147, 162, 162, 161, 163, 163, 218, 162,
- 219, 827, 163, 173, 173, 173, 173, 830, 244, 831,
-
- 162, 835, 240, 163, 174, 174, 174, 174, 175, 175,
- 175, 175, 176, 176, 176, 176, 177, 177, 177, 177,
- 178, 178, 178, 178, 179, 179, 179, 179, 181, 181,
- 181, 181, 181, 181, 837, 839, 241, 182, 181, 182,
- 182, 182, 182, 182, 182, 183, 183, 183, 183, 183,
- 183, 184, 184, 184, 184, 184, 184, 185, 186, 241,
- 192, 194, 185, 186, 181, 192, 194, 243, 195, 845,
- 452, 185, 186, 195, 192, 194, 846, 185, 186, 243,
- 185, 186, 195, 192, 194, 196, 452, 197, 199, 198,
- 196, 195, 197, 199, 198, 288, 842, 842, 288, 196,
-
- 242, 197, 199, 198, 851, 196, 807, 197, 196, 198,
- 197, 199, 198, 201, 203, 204, 206, 207, 201, 203,
- 204, 206, 207, 242, 806, 804, 803, 201, 203, 204,
- 206, 207, 260, 799, 203, 204, 201, 203, 204, 206,
- 207, 209, 210, 211, 798, 260, 209, 210, 211, 303,
- 303, 303, 303, 212, 213, 209, 210, 211, 212, 213,
- 797, 209, 210, 211, 209, 210, 211, 212, 213, 579,
- 214, 796, 579, 212, 213, 214, 212, 213, 220, 794,
- 221, 223, 224, 220, 214, 221, 223, 224, 792, 790,
- 214, 787, 220, 214, 221, 223, 224, 226, 786, 784,
-
- 783, 220, 226, 221, 223, 224, 277, 227, 228, 229,
- 231, 226, 227, 228, 229, 231, 782, 226, 781, 277,
- 226, 227, 228, 229, 231, 780, 779, 227, 228, 229,
- 227, 228, 229, 231, 232, 233, 234, 776, 775, 232,
- 233, 234, 304, 304, 304, 304, 235, 236, 232, 233,
- 234, 235, 236, 773, 232, 233, 234, 232, 233, 234,
- 235, 236, 772, 245, 771, 770, 235, 236, 245, 235,
- 236, 256, 256, 256, 256, 256, 256, 245, 257, 257,
- 257, 257, 257, 257, 258, 258, 245, 272, 272, 769,
- 258, 290, 290, 272, 291, 291, 768, 290, 766, 311,
-
- 291, 258, 765, 764, 272, 314, 292, 292, 290, 762,
- 760, 291, 292, 300, 759, 300, 756, 300, 305, 305,
- 305, 305, 311, 292, 306, 306, 306, 306, 314, 322,
- 300, 307, 307, 307, 307, 308, 308, 308, 308, 308,
- 308, 309, 309, 309, 309, 309, 309, 315, 326, 315,
- 329, 332, 322, 335, 338, 341, 344, 347, 350, 353,
- 356, 359, 362, 365, 368, 371, 374, 384, 387, 391,
- 315, 326, 394, 329, 332, 398, 335, 338, 341, 344,
- 347, 350, 353, 356, 359, 362, 365, 368, 371, 374,
- 384, 387, 391, 401, 404, 394, 407, 411, 398, 414,
-
- 417, 420, 423, 426, 438, 440, 443, 753, 504, 504,
- 553, 556, 752, 751, 642, 642, 401, 404, 750, 407,
- 411, 738, 414, 417, 420, 423, 426, 438, 440, 443,
- 504, 737, 736, 553, 556, 642, 850, 850, 850, 852,
- 852, 707, 700, 699, 696, 695, 694, 693, 692, 691,
- 690, 689, 688, 687, 685, 682, 681, 680, 679, 678,
- 677, 676, 675, 674, 673, 672, 670, 669, 668, 667,
- 665, 663, 662, 661, 660, 659, 658, 657, 656, 655,
- 654, 653, 652, 651, 650, 649, 648, 647, 646, 645,
- 644, 643, 641, 640, 639, 638, 637, 636, 635, 634,
-
- 633, 630, 629, 628, 627, 626, 625, 624, 623, 622,
- 621, 620, 619, 618, 617, 616, 615, 614, 613, 612,
- 610, 609, 608, 607, 606, 605, 604, 603, 602, 601,
- 600, 599, 598, 597, 596, 595, 593, 592, 591, 590,
- 589, 587, 586, 585, 584, 583, 582, 581, 578, 577,
- 575, 574, 573, 572, 569, 568, 567, 566, 565, 564,
- 563, 561, 560, 559, 558, 557, 555, 554, 552, 551,
- 550, 549, 548, 547, 546, 545, 544, 543, 542, 541,
- 540, 539, 538, 537, 536, 535, 534, 533, 532, 531,
- 530, 526, 525, 524, 523, 522, 521, 520, 519, 518,
-
- 517, 516, 515, 514, 513, 512, 511, 510, 509, 508,
- 507, 506, 505, 502, 501, 500, 497, 496, 495, 494,
- 493, 492, 490, 488, 487, 486, 484, 483, 482, 481,
- 480, 479, 478, 477, 476, 475, 474, 473, 472, 471,
- 470, 469, 468, 467, 465, 464, 463, 462, 461, 460,
- 459, 456, 455, 454, 451, 450, 449, 448, 447, 446,
- 445, 444, 442, 441, 439, 437, 436, 435, 434, 433,
- 432, 431, 430, 428, 427, 425, 424, 422, 421, 419,
- 418, 416, 415, 413, 412, 410, 409, 408, 406, 405,
- 403, 402, 400, 399, 397, 396, 395, 393, 392, 390,
-
- 388, 386, 385, 383, 382, 380, 378, 377, 376, 375,
- 373, 372, 370, 369, 367, 366, 364, 363, 361, 360,
- 358, 357, 355, 354, 352, 351, 349, 348, 346, 345,
- 343, 342, 340, 339, 337, 336, 334, 333, 331, 330,
- 328, 327, 325, 323, 321, 320, 319, 318, 317, 316,
- 313, 312, 310, 302, 301, 299, 298, 297, 296, 295,
- 294, 289, 287, 286, 285, 284, 283, 282, 281, 280,
- 278, 276, 275, 273, 271, 270, 267, 266, 265, 264,
- 263, 262, 261, 259, 255, 254, 253, 252, 251, 250,
- 249, 248, 247, 246, 238, 237, 230, 225, 222, 217,
-
- 216, 215, 193, 191, 190, 189, 187, 172, 171, 170,
- 168, 167, 166, 165, 164, 158, 156, 155, 154, 153,
- 152, 151, 150, 149, 148, 145, 144, 143, 142, 141,
- 139, 138, 137, 135, 134, 131, 129, 127, 126, 125,
- 124, 123, 122, 121, 120, 119, 115, 114, 113, 112,
- 110, 109, 107, 106, 105, 104, 103, 102, 101, 100,
- 98, 97, 96, 95, 94, 93, 91, 90, 89, 88,
- 87, 86, 85, 83, 82, 79, 78, 77, 76, 74,
- 73, 72, 56, 55, 52, 51, 38, 37, 35, 34,
- 33, 32, 31, 30, 28, 20, 8, 7, 3, 849,
-
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849, 849, 849, 849,
- 849, 849, 849, 849, 849, 849, 849
+ 1, 1, 1, 1, 1, 1, 1, 5, 862, 5,
+ 10, 24, 47, 17, 18, 47, 24, 10, 10, 10,
+ 10, 10, 10, 10, 17, 18, 17, 28, 18, 62,
+ 19, 30, 17, 11, 11, 11, 11, 11, 11, 11,
+
+ 19, 20, 62, 863, 11, 28, 37, 20, 37, 30,
+ 10, 10, 10, 10, 10, 10, 10, 10, 10, 49,
+ 49, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+ 11, 49, 10, 10, 10, 10, 12, 12, 12, 12,
+ 12, 12, 12, 83, 83, 121, 12, 12, 13, 13,
+ 13, 13, 13, 13, 13, 102, 121, 102, 13, 13,
+ 14, 14, 14, 14, 14, 14, 14, 15, 48, 15,
+ 14, 14, 48, 12, 50, 23, 15, 50, 274, 22,
+ 87, 22, 15, 23, 15, 13, 22, 25, 23, 22,
+ 26, 274, 26, 26, 23, 54, 25, 14, 87, 864,
+
+ 25, 54, 45, 45, 55, 26, 25, 27, 45, 27,
+ 27, 27, 27, 27, 45, 27, 865, 27, 55, 45,
+ 95, 45, 27, 27, 27, 55, 27, 42, 44, 44,
+ 44, 44, 44, 44, 46, 46, 51, 51, 44, 95,
+ 46, 58, 51, 60, 60, 64, 64, 64, 64, 60,
+ 105, 46, 58, 51, 103, 58, 164, 60, 58, 112,
+ 60, 103, 105, 123, 44, 123, 164, 42, 42, 42,
+ 42, 42, 42, 112, 42, 42, 106, 63, 42, 42,
+ 42, 42, 42, 42, 42, 42, 42, 145, 61, 42,
+ 61, 869, 106, 61, 61, 63, 63, 63, 63, 145,
+
+ 870, 61, 65, 65, 65, 65, 66, 66, 66, 66,
+ 67, 67, 67, 67, 67, 67, 115, 872, 84, 84,
+ 67, 68, 68, 68, 68, 68, 68, 68, 84, 76,
+ 115, 69, 68, 69, 69, 69, 69, 69, 69, 76,
+ 122, 133, 122, 135, 302, 76, 67, 302, 133, 122,
+ 138, 138, 873, 122, 151, 151, 138, 135, 68, 137,
+ 151, 137, 137, 137, 137, 137, 137, 138, 141, 141,
+ 141, 151, 152, 152, 141, 162, 165, 874, 152, 252,
+ 227, 162, 165, 174, 876, 141, 166, 166, 258, 152,
+ 167, 167, 166, 174, 168, 168, 167, 226, 227, 166,
+
+ 168, 877, 252, 166, 402, 402, 258, 167, 878, 226,
+ 879, 168, 178, 178, 178, 178, 179, 179, 179, 179,
+ 180, 180, 180, 180, 181, 181, 181, 181, 182, 182,
+ 182, 182, 183, 183, 183, 183, 184, 184, 184, 184,
+ 186, 186, 186, 186, 186, 186, 439, 439, 253, 187,
+ 186, 187, 187, 187, 187, 187, 187, 188, 188, 188,
+ 188, 188, 188, 189, 189, 189, 189, 189, 189, 190,
+ 191, 253, 200, 202, 190, 191, 186, 200, 202, 257,
+ 203, 454, 454, 190, 191, 203, 200, 202, 882, 190,
+ 191, 257, 190, 191, 203, 200, 202, 204, 883, 205,
+
+ 207, 206, 204, 203, 205, 207, 206, 317, 317, 317,
+ 317, 204, 254, 205, 207, 206, 884, 204, 889, 205,
+ 204, 206, 205, 207, 206, 209, 211, 212, 214, 215,
+ 209, 211, 212, 214, 215, 254, 891, 893, 256, 209,
+ 211, 212, 214, 215, 896, 897, 211, 212, 209, 211,
+ 212, 214, 215, 217, 218, 219, 901, 288, 217, 218,
+ 219, 256, 704, 704, 903, 220, 221, 217, 218, 219,
+ 220, 221, 288, 217, 218, 219, 217, 218, 219, 220,
+ 221, 905, 222, 704, 471, 220, 221, 222, 220, 221,
+ 229, 911, 232, 235, 236, 229, 222, 232, 235, 236,
+
+ 471, 912, 222, 917, 229, 222, 232, 235, 236, 238,
+ 908, 908, 860, 229, 238, 232, 235, 236, 291, 239,
+ 240, 241, 243, 238, 239, 240, 241, 243, 858, 238,
+ 856, 291, 238, 239, 240, 241, 243, 853, 852, 239,
+ 240, 241, 239, 240, 241, 243, 244, 245, 246, 850,
+ 849, 244, 245, 246, 318, 318, 318, 318, 248, 249,
+ 244, 245, 246, 248, 249, 848, 244, 245, 246, 244,
+ 245, 246, 248, 249, 641, 259, 847, 641, 248, 249,
+ 259, 248, 249, 270, 270, 270, 270, 270, 270, 259,
+ 271, 271, 271, 271, 271, 271, 272, 272, 259, 286,
+
+ 286, 846, 272, 304, 304, 286, 305, 305, 845, 304,
+ 324, 324, 305, 272, 842, 841, 286, 325, 306, 306,
+ 304, 839, 838, 305, 306, 314, 837, 314, 836, 314,
+ 319, 319, 319, 319, 835, 306, 320, 320, 320, 320,
+ 325, 324, 314, 321, 321, 321, 321, 322, 322, 322,
+ 322, 322, 322, 323, 323, 323, 323, 323, 323, 327,
+ 327, 328, 329, 336, 329, 335, 335, 339, 339, 340,
+ 342, 342, 343, 345, 345, 834, 346, 348, 348, 349,
+ 351, 351, 352, 355, 328, 329, 336, 354, 354, 358,
+ 327, 361, 340, 357, 357, 343, 335, 364, 339, 346,
+
+ 367, 342, 349, 832, 345, 352, 355, 370, 348, 360,
+ 360, 351, 358, 373, 361, 363, 363, 831, 354, 376,
+ 364, 366, 366, 367, 357, 369, 369, 372, 372, 830,
+ 370, 375, 375, 378, 378, 828, 373, 379, 381, 381,
+ 360, 826, 376, 382, 384, 384, 363, 385, 387, 387,
+ 388, 399, 366, 398, 398, 404, 369, 408, 372, 411,
+ 379, 825, 375, 822, 378, 415, 382, 403, 403, 381,
+ 385, 407, 407, 388, 399, 384, 410, 410, 404, 387,
+ 408, 418, 411, 421, 398, 414, 414, 424, 415, 417,
+ 417, 420, 420, 423, 423, 427, 427, 819, 403, 818,
+
+ 428, 817, 407, 816, 418, 431, 421, 410, 430, 430,
+ 424, 433, 433, 434, 436, 436, 414, 437, 440, 440,
+ 417, 441, 420, 428, 423, 444, 427, 457, 431, 443,
+ 443, 448, 448, 450, 450, 459, 434, 452, 452, 430,
+ 437, 815, 433, 462, 441, 436, 455, 455, 444, 440,
+ 457, 461, 461, 525, 525, 612, 612, 614, 459, 814,
+ 443, 617, 448, 802, 450, 801, 462, 800, 452, 615,
+ 615, 718, 718, 722, 722, 525, 771, 455, 764, 763,
+ 614, 760, 461, 759, 617, 758, 612, 757, 756, 755,
+ 754, 753, 752, 751, 749, 746, 745, 744, 743, 742,
+
+ 615, 741, 718, 740, 722, 916, 916, 916, 918, 918,
+ 739, 738, 737, 736, 734, 733, 732, 731, 729, 727,
+ 726, 725, 724, 723, 721, 720, 719, 717, 716, 715,
+ 714, 713, 712, 711, 710, 709, 708, 707, 706, 705,
+ 703, 702, 701, 700, 699, 698, 697, 696, 695, 692,
+ 691, 690, 689, 688, 687, 686, 685, 684, 683, 682,
+ 681, 680, 679, 678, 677, 676, 675, 674, 672, 671,
+ 670, 669, 668, 667, 666, 665, 664, 663, 662, 661,
+ 660, 659, 658, 657, 655, 654, 653, 652, 651, 649,
+ 648, 647, 646, 645, 644, 643, 640, 639, 637, 636,
+
+ 635, 634, 631, 630, 629, 628, 627, 626, 625, 623,
+ 622, 621, 620, 619, 618, 616, 613, 611, 610, 608,
+ 607, 606, 605, 604, 603, 602, 601, 600, 599, 598,
+ 596, 595, 594, 593, 592, 591, 590, 589, 588, 587,
+ 586, 585, 584, 583, 582, 581, 580, 579, 578, 577,
+ 576, 575, 574, 573, 570, 569, 565, 564, 563, 562,
+ 561, 560, 559, 558, 557, 556, 555, 554, 553, 552,
+ 551, 550, 549, 548, 547, 546, 545, 544, 543, 542,
+ 541, 540, 539, 538, 537, 536, 535, 534, 533, 532,
+ 531, 530, 529, 528, 527, 526, 523, 522, 521, 520,
+
+ 519, 516, 515, 514, 513, 512, 511, 509, 507, 506,
+ 505, 503, 502, 501, 500, 499, 498, 497, 496, 495,
+ 494, 493, 492, 491, 490, 489, 488, 487, 486, 484,
+ 483, 482, 481, 480, 479, 478, 475, 474, 473, 470,
+ 469, 468, 467, 466, 465, 464, 463, 460, 458, 456,
+ 453, 451, 449, 446, 445, 442, 438, 435, 432, 429,
+ 426, 425, 422, 419, 416, 413, 412, 409, 405, 401,
+ 400, 396, 394, 392, 391, 390, 389, 386, 383, 380,
+ 377, 374, 371, 368, 365, 362, 359, 356, 353, 350,
+ 347, 344, 341, 337, 334, 333, 332, 331, 330, 326,
+
+ 316, 315, 313, 312, 311, 310, 309, 308, 303, 301,
+ 300, 299, 298, 297, 296, 295, 294, 292, 290, 289,
+ 287, 285, 284, 281, 280, 279, 278, 277, 276, 275,
+ 273, 269, 268, 267, 266, 265, 264, 263, 262, 261,
+ 260, 255, 251, 250, 247, 242, 237, 233, 231, 230,
+ 228, 225, 224, 223, 201, 199, 196, 195, 192, 177,
+ 176, 175, 173, 172, 171, 170, 169, 163, 161, 160,
+ 159, 158, 157, 156, 155, 154, 153, 150, 149, 148,
+ 147, 146, 144, 143, 142, 140, 139, 136, 134, 132,
+ 131, 130, 129, 128, 127, 126, 125, 124, 120, 119,
+
+ 118, 117, 116, 114, 113, 111, 110, 109, 108, 107,
+ 104, 101, 100, 99, 98, 97, 96, 94, 93, 92,
+ 91, 90, 89, 88, 86, 85, 82, 81, 80, 79,
+ 78, 77, 75, 74, 73, 57, 56, 53, 52, 39,
+ 38, 36, 35, 34, 33, 32, 31, 29, 21, 16,
+ 8, 7, 3, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915, 915, 915, 915, 915, 915, 915, 915, 915, 915,
+ 915
} ;
/* The intent behind this definition is that it'll catch
@@ -1045,6 +1111,8 @@ static yyconst flex_int16_t yy_chk[1368] =
#define require_ARB_vp (yyextra->mode == ARB_vertex)
#define require_ARB_fp (yyextra->mode == ARB_fragment)
#define require_NV_fp (yyextra->option.NV_fragment)
+#define require_NV_vp2 (yyextra->option.NV_vertex2)
+#define require_NV_vp3 (yyextra->option.NV_vertex3)
#define require_shadow (yyextra->option.Shadow)
#define require_rect (yyextra->option.TexRect)
#define require_texarray (yyextra->option.TexArray)
@@ -1075,7 +1143,7 @@ static yyconst flex_int16_t yy_chk[1368] =
#define return_opcode(condition, token, opcode, len) \
do { \
- if (condition && \
+ if ((condition) && \
_mesa_parse_instruction_suffix(yyextra, \
yytext + len, \
& yylval->temp_inst)) { \
@@ -1153,7 +1221,7 @@ handle_ident(struct asm_parser_state *state, const char *text, YYSTYPE *lval)
} while(0);
#define YY_EXTRA_TYPE struct asm_parser_state *
-#line 1157 "lex.yy.c"
+#line 1225 "lex.yy.c"
#define INITIAL 0
@@ -1290,7 +1358,12 @@ static int input (yyscan_t yyscanner );
/* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
#endif
/* Copy whatever the last rule matched to the standard output. */
@@ -1394,10 +1467,10 @@ YY_DECL
register int yy_act;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-#line 157 "program_lexer.l"
+#line 159 "program_lexer.l"
-#line 1401 "lex.yy.c"
+#line 1474 "lex.yy.c"
yylval = yylval_param;
@@ -1454,13 +1527,13 @@ yy_match:
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 850 )
+ if ( yy_current_state >= 916 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
++yy_cp;
}
- while ( yy_base[yy_current_state] != 1300 );
+ while ( yy_base[yy_current_state] != 1454 );
yy_find_action:
yy_act = yy_accept[yy_current_state];
@@ -1486,17 +1559,17 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 159 "program_lexer.l"
+#line 161 "program_lexer.l"
{ return ARBvp_10; }
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 160 "program_lexer.l"
+#line 162 "program_lexer.l"
{ return ARBfp_10; }
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 161 "program_lexer.l"
+#line 163 "program_lexer.l"
{
yylval->integer = at_address;
return_token_or_IDENTIFIER(require_ARB_vp, ADDRESS);
@@ -1504,745 +1577,795 @@ YY_RULE_SETUP
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 165 "program_lexer.l"
+#line 167 "program_lexer.l"
{ return ALIAS; }
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 166 "program_lexer.l"
+#line 168 "program_lexer.l"
{ return ATTRIB; }
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 167 "program_lexer.l"
+#line 169 "program_lexer.l"
{ return END; }
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 168 "program_lexer.l"
+#line 170 "program_lexer.l"
{ return OPTION; }
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 169 "program_lexer.l"
+#line 171 "program_lexer.l"
{ return OUTPUT; }
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 170 "program_lexer.l"
+#line 172 "program_lexer.l"
{ return PARAM; }
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 171 "program_lexer.l"
+#line 173 "program_lexer.l"
{ yylval->integer = at_temp; return TEMP; }
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 173 "program_lexer.l"
+#line 175 "program_lexer.l"
{ return_opcode( 1, VECTOR_OP, ABS, 3); }
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 174 "program_lexer.l"
+#line 176 "program_lexer.l"
{ return_opcode( 1, BIN_OP, ADD, 3); }
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 175 "program_lexer.l"
-{ return_opcode(require_ARB_vp, ARL, ARL, 3); }
+#line 177 "program_lexer.l"
+{ return_opcode(require_NV_vp2, ARA_OP, ARA, 3); }
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 177 "program_lexer.l"
-{ return_opcode(require_ARB_fp, TRI_OP, CMP, 3); }
+#line 178 "program_lexer.l"
+{ return_opcode(require_ARB_vp, (require_NV_vp2) ? ARL_NV_OP : ARL_OP, ARL, 3); }
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 178 "program_lexer.l"
-{ return_opcode(require_ARB_fp, SCALAR_OP, COS, 3); }
+#line 179 "program_lexer.l"
+{ return_opcode(require_NV_vp2, ARL_OP, ARR, 3); }
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 180 "program_lexer.l"
-{ return_opcode(require_NV_fp, VECTOR_OP, DDX, 3); }
+#line 181 "program_lexer.l"
+{ return_opcode(require_NV_vp2, BRA_OP, BRA, 3); }
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 181 "program_lexer.l"
-{ return_opcode(require_NV_fp, VECTOR_OP, DDY, 3); }
+#line 183 "program_lexer.l"
+{ return_opcode(require_NV_vp2, BRA_OP, CAL, 3); }
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 182 "program_lexer.l"
-{ return_opcode( 1, BIN_OP, DP3, 3); }
+#line 184 "program_lexer.l"
+{ return_opcode(require_ARB_fp, TRI_OP, CMP, 3); }
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 183 "program_lexer.l"
-{ return_opcode( 1, BIN_OP, DP4, 3); }
+#line 185 "program_lexer.l"
+{ return_opcode(require_ARB_fp || require_NV_vp2, SCALAR_OP, COS, 3); }
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 184 "program_lexer.l"
-{ return_opcode( 1, BIN_OP, DPH, 3); }
+#line 187 "program_lexer.l"
+{ return_opcode(require_NV_fp, VECTOR_OP, DDX, 3); }
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 185 "program_lexer.l"
-{ return_opcode( 1, BIN_OP, DST, 3); }
+#line 188 "program_lexer.l"
+{ return_opcode(require_NV_fp, VECTOR_OP, DDY, 3); }
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 187 "program_lexer.l"
-{ return_opcode( 1, SCALAR_OP, EX2, 3); }
+#line 189 "program_lexer.l"
+{ return_opcode( 1, BIN_OP, DP3, 3); }
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 188 "program_lexer.l"
-{ return_opcode(require_ARB_vp, SCALAR_OP, EXP, 3); }
+#line 190 "program_lexer.l"
+{ return_opcode( 1, BIN_OP, DP4, 3); }
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 190 "program_lexer.l"
-{ return_opcode( 1, VECTOR_OP, FLR, 3); }
+#line 191 "program_lexer.l"
+{ return_opcode( 1, BIN_OP, DPH, 3); }
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 191 "program_lexer.l"
-{ return_opcode( 1, VECTOR_OP, FRC, 3); }
+#line 192 "program_lexer.l"
+{ return_opcode( 1, BIN_OP, DST, 3); }
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 193 "program_lexer.l"
-{ return_opcode(require_ARB_fp, KIL, KIL, 3); }
+#line 194 "program_lexer.l"
+{ return_opcode( 1, SCALAR_OP, EX2, 3); }
YY_BREAK
case 27:
YY_RULE_SETUP
#line 195 "program_lexer.l"
-{ return_opcode( 1, VECTOR_OP, LIT, 3); }
+{ return_opcode(require_ARB_vp, SCALAR_OP, EXP, 3); }
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 196 "program_lexer.l"
-{ return_opcode( 1, SCALAR_OP, LG2, 3); }
+#line 197 "program_lexer.l"
+{ return_opcode( 1, VECTOR_OP, FLR, 3); }
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 197 "program_lexer.l"
-{ return_opcode(require_ARB_vp, SCALAR_OP, LOG, 3); }
+#line 198 "program_lexer.l"
+{ return_opcode( 1, VECTOR_OP, FRC, 3); }
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 198 "program_lexer.l"
-{ return_opcode(require_ARB_fp, TRI_OP, LRP, 3); }
+#line 200 "program_lexer.l"
+{ return_opcode(require_ARB_fp, KIL, KIL, 3); }
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 200 "program_lexer.l"
-{ return_opcode( 1, TRI_OP, MAD, 3); }
+#line 202 "program_lexer.l"
+{ return_opcode( 1, VECTOR_OP, LIT, 3); }
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 201 "program_lexer.l"
-{ return_opcode( 1, BIN_OP, MAX, 3); }
+#line 203 "program_lexer.l"
+{ return_opcode( 1, SCALAR_OP, LG2, 3); }
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 202 "program_lexer.l"
-{ return_opcode( 1, BIN_OP, MIN, 3); }
+#line 204 "program_lexer.l"
+{ return_opcode(require_ARB_vp, SCALAR_OP, LOG, 3); }
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 203 "program_lexer.l"
-{ return_opcode( 1, VECTOR_OP, MOV, 3); }
+#line 205 "program_lexer.l"
+{ return_opcode(require_ARB_fp, TRI_OP, LRP, 3); }
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 204 "program_lexer.l"
-{ return_opcode( 1, BIN_OP, MUL, 3); }
+#line 207 "program_lexer.l"
+{ return_opcode( 1, TRI_OP, MAD, 3); }
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 206 "program_lexer.l"
-{ return_opcode(require_NV_fp, VECTOR_OP, PK2H, 4); }
+#line 208 "program_lexer.l"
+{ return_opcode( 1, BIN_OP, MAX, 3); }
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 207 "program_lexer.l"
-{ return_opcode(require_NV_fp, VECTOR_OP, PK2US, 5); }
+#line 209 "program_lexer.l"
+{ return_opcode( 1, BIN_OP, MIN, 3); }
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 208 "program_lexer.l"
-{ return_opcode(require_NV_fp, VECTOR_OP, PK4B, 4); }
+#line 210 "program_lexer.l"
+{ return_opcode( 1, VECTOR_OP, MOV, 3); }
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 209 "program_lexer.l"
-{ return_opcode(require_NV_fp, VECTOR_OP, PK4UB, 5); }
+#line 211 "program_lexer.l"
+{ return_opcode( 1, BIN_OP, MUL, 3); }
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 210 "program_lexer.l"
-{ return_opcode( 1, BINSC_OP, POW, 3); }
+#line 213 "program_lexer.l"
+{ return_opcode(require_NV_fp, VECTOR_OP, PK2H, 4); }
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 212 "program_lexer.l"
-{ return_opcode( 1, SCALAR_OP, RCP, 3); }
+#line 214 "program_lexer.l"
+{ return_opcode(require_NV_fp, VECTOR_OP, PK2US, 5); }
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 213 "program_lexer.l"
-{ return_opcode(require_NV_fp, BIN_OP, RFL, 3); }
+#line 215 "program_lexer.l"
+{ return_opcode(require_NV_fp, VECTOR_OP, PK4B, 4); }
YY_BREAK
case 43:
YY_RULE_SETUP
-#line 214 "program_lexer.l"
-{ return_opcode( 1, SCALAR_OP, RSQ, 3); }
+#line 216 "program_lexer.l"
+{ return_opcode(require_NV_fp, VECTOR_OP, PK4UB, 5); }
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 216 "program_lexer.l"
-{ return_opcode(require_ARB_fp, SCALAR_OP, SCS, 3); }
+#line 217 "program_lexer.l"
+{ return_opcode(require_NV_vp3, PUSHA_OP, PUSHA, 5); }
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 217 "program_lexer.l"
-{ return_opcode(require_NV_fp, BIN_OP, SEQ, 3); }
+#line 218 "program_lexer.l"
+{ return_opcode(require_NV_vp3, POPA_OP, POPA, 4); }
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 218 "program_lexer.l"
-{ return_opcode(require_NV_fp, BIN_OP, SFL, 3); }
+#line 219 "program_lexer.l"
+{ return_opcode( 1, BINSC_OP, POW, 3); }
YY_BREAK
case 47:
YY_RULE_SETUP
-#line 219 "program_lexer.l"
-{ return_opcode( 1, BIN_OP, SGE, 3); }
+#line 221 "program_lexer.l"
+{ return_opcode(require_NV_vp2, FLOW_OP, RET, 3); }
YY_BREAK
case 48:
YY_RULE_SETUP
-#line 220 "program_lexer.l"
-{ return_opcode(require_NV_fp, BIN_OP, SGT, 3); }
+#line 222 "program_lexer.l"
+{ return_opcode( 1, SCALAR_OP, RCP, 3); }
YY_BREAK
case 49:
YY_RULE_SETUP
-#line 221 "program_lexer.l"
-{ return_opcode(require_ARB_fp, SCALAR_OP, SIN, 3); }
+#line 223 "program_lexer.l"
+{ return_opcode(require_NV_vp2, SCALAR_OP, RCC, 3); }
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 222 "program_lexer.l"
-{ return_opcode(require_NV_fp, BIN_OP, SLE, 3); }
+#line 224 "program_lexer.l"
+{ return_opcode(require_NV_fp, BIN_OP, RFL, 3); }
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 223 "program_lexer.l"
-{ return_opcode( 1, BIN_OP, SLT, 3); }
+#line 225 "program_lexer.l"
+{ return_opcode( 1, SCALAR_OP, RSQ, 3); }
YY_BREAK
case 52:
YY_RULE_SETUP
-#line 224 "program_lexer.l"
-{ return_opcode(require_NV_fp, BIN_OP, SNE, 3); }
+#line 227 "program_lexer.l"
+{ return_opcode(require_ARB_fp, SCALAR_OP, SCS, 3); }
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 225 "program_lexer.l"
-{ return_opcode(require_NV_fp, BIN_OP, STR, 3); }
+#line 228 "program_lexer.l"
+{ return_opcode(require_NV_fp || require_NV_vp2, BIN_OP, SEQ, 3); }
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 226 "program_lexer.l"
-{ return_opcode( 1, BIN_OP, SUB, 3); }
+#line 229 "program_lexer.l"
+{ return_opcode(require_NV_fp || require_NV_vp2, BIN_OP, SFL, 3); }
YY_BREAK
case 55:
YY_RULE_SETUP
-#line 227 "program_lexer.l"
-{ return_opcode( 1, SWZ, SWZ, 3); }
+#line 230 "program_lexer.l"
+{ return_opcode( 1, BIN_OP, SGE, 3); }
YY_BREAK
case 56:
YY_RULE_SETUP
-#line 229 "program_lexer.l"
-{ return_opcode(require_ARB_fp, SAMPLE_OP, TEX, 3); }
+#line 231 "program_lexer.l"
+{ return_opcode(require_NV_fp || require_NV_vp2, BIN_OP, SGT, 3); }
YY_BREAK
case 57:
YY_RULE_SETUP
-#line 230 "program_lexer.l"
-{ return_opcode(require_ARB_fp, SAMPLE_OP, TXB, 3); }
+#line 232 "program_lexer.l"
+{ return_opcode(require_ARB_fp || require_NV_vp2, SCALAR_OP, SIN, 3); }
YY_BREAK
case 58:
YY_RULE_SETUP
-#line 231 "program_lexer.l"
-{ return_opcode(require_NV_fp, TXD_OP, TXD, 3); }
+#line 233 "program_lexer.l"
+{ return_opcode(require_NV_fp || require_NV_vp2, BIN_OP, SLE, 3); }
YY_BREAK
case 59:
YY_RULE_SETUP
-#line 232 "program_lexer.l"
-{ return_opcode(require_ARB_fp, SAMPLE_OP, TXP, 3); }
+#line 234 "program_lexer.l"
+{ return_opcode( 1, BIN_OP, SLT, 3); }
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 234 "program_lexer.l"
-{ return_opcode(require_NV_fp, SCALAR_OP, UP2H, 4); }
+#line 235 "program_lexer.l"
+{ return_opcode(require_NV_fp || require_NV_vp2, BIN_OP, SNE, 3); }
YY_BREAK
case 61:
YY_RULE_SETUP
-#line 235 "program_lexer.l"
-{ return_opcode(require_NV_fp, SCALAR_OP, UP2US, 5); }
+#line 236 "program_lexer.l"
+{ return_opcode(require_NV_vp2, VECTOR_OP, SSG, 3); }
YY_BREAK
case 62:
YY_RULE_SETUP
-#line 236 "program_lexer.l"
-{ return_opcode(require_NV_fp, SCALAR_OP, UP4B, 4); }
+#line 237 "program_lexer.l"
+{ return_opcode(require_NV_fp || require_NV_vp2, BIN_OP, STR, 3); }
YY_BREAK
case 63:
YY_RULE_SETUP
-#line 237 "program_lexer.l"
-{ return_opcode(require_NV_fp, SCALAR_OP, UP4UB, 5); }
+#line 238 "program_lexer.l"
+{ return_opcode( 1, BIN_OP, SUB, 3); }
YY_BREAK
case 64:
YY_RULE_SETUP
#line 239 "program_lexer.l"
-{ return_opcode(require_NV_fp, TRI_OP, X2D, 3); }
+{ return_opcode( 1, SWZ, SWZ, 3); }
YY_BREAK
case 65:
YY_RULE_SETUP
-#line 240 "program_lexer.l"
-{ return_opcode( 1, BIN_OP, XPD, 3); }
+#line 241 "program_lexer.l"
+{ return_opcode(require_ARB_fp || require_NV_vp3, SAMPLE_OP, TEX, 3); }
YY_BREAK
case 66:
YY_RULE_SETUP
#line 242 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_vp, VERTEX); }
+{ return_opcode(require_ARB_fp || require_NV_vp3, SAMPLE_OP, TXB, 3); }
YY_BREAK
case 67:
YY_RULE_SETUP
#line 243 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp, FRAGMENT); }
+{ return_opcode(require_NV_fp, TXD_OP, TXD, 3); }
YY_BREAK
case 68:
YY_RULE_SETUP
#line 244 "program_lexer.l"
-{ return PROGRAM; }
+{ return_opcode(require_NV_vp3, SAMPLE_OP, TXP, 3); }
YY_BREAK
case 69:
YY_RULE_SETUP
#line 245 "program_lexer.l"
-{ return STATE; }
+{ return_opcode(require_ARB_fp || require_NV_vp3, SAMPLE_OP, TXP, 3); }
YY_BREAK
case 70:
YY_RULE_SETUP
-#line 246 "program_lexer.l"
-{ return RESULT; }
+#line 247 "program_lexer.l"
+{ return_opcode(require_NV_fp, SCALAR_OP, UP2H, 4); }
YY_BREAK
case 71:
YY_RULE_SETUP
#line 248 "program_lexer.l"
-{ return AMBIENT; }
+{ return_opcode(require_NV_fp, SCALAR_OP, UP2US, 5); }
YY_BREAK
case 72:
YY_RULE_SETUP
#line 249 "program_lexer.l"
-{ return ATTENUATION; }
+{ return_opcode(require_NV_fp, SCALAR_OP, UP4B, 4); }
YY_BREAK
case 73:
YY_RULE_SETUP
#line 250 "program_lexer.l"
-{ return BACK; }
+{ return_opcode(require_NV_fp, SCALAR_OP, UP4UB, 5); }
YY_BREAK
case 74:
YY_RULE_SETUP
-#line 251 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, CLIP); }
+#line 252 "program_lexer.l"
+{ return_opcode(require_NV_fp, TRI_OP, X2D, 3); }
YY_BREAK
case 75:
YY_RULE_SETUP
-#line 252 "program_lexer.l"
-{ return COLOR; }
+#line 253 "program_lexer.l"
+{ return_opcode( 1, BIN_OP, XPD, 3); }
YY_BREAK
case 76:
YY_RULE_SETUP
-#line 253 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_fp, DEPTH); }
+#line 255 "program_lexer.l"
+{ return_token_or_IDENTIFIER(require_ARB_vp, VERTEX); }
YY_BREAK
case 77:
YY_RULE_SETUP
-#line 254 "program_lexer.l"
-{ return DIFFUSE; }
+#line 256 "program_lexer.l"
+{ return_token_or_IDENTIFIER(require_ARB_fp, FRAGMENT); }
YY_BREAK
case 78:
YY_RULE_SETUP
-#line 255 "program_lexer.l"
-{ return DIRECTION; }
+#line 257 "program_lexer.l"
+{ return PROGRAM; }
YY_BREAK
case 79:
YY_RULE_SETUP
-#line 256 "program_lexer.l"
-{ return EMISSION; }
+#line 258 "program_lexer.l"
+{ return STATE; }
YY_BREAK
case 80:
YY_RULE_SETUP
-#line 257 "program_lexer.l"
-{ return ENV; }
+#line 259 "program_lexer.l"
+{ return RESULT; }
YY_BREAK
case 81:
YY_RULE_SETUP
-#line 258 "program_lexer.l"
-{ return EYE; }
+#line 261 "program_lexer.l"
+{ return AMBIENT; }
YY_BREAK
case 82:
YY_RULE_SETUP
-#line 259 "program_lexer.l"
-{ return FOGCOORD; }
+#line 262 "program_lexer.l"
+{ return ATTENUATION; }
YY_BREAK
case 83:
YY_RULE_SETUP
-#line 260 "program_lexer.l"
-{ return FOG; }
+#line 263 "program_lexer.l"
+{ return BACK; }
YY_BREAK
case 84:
YY_RULE_SETUP
-#line 261 "program_lexer.l"
-{ return FRONT; }
+#line 264 "program_lexer.l"
+{ return_token_or_DOT(require_ARB_vp, CLIP); }
YY_BREAK
case 85:
YY_RULE_SETUP
-#line 262 "program_lexer.l"
-{ return HALF; }
+#line 265 "program_lexer.l"
+{ return COLOR; }
YY_BREAK
case 86:
YY_RULE_SETUP
-#line 263 "program_lexer.l"
-{ return INVERSE; }
+#line 266 "program_lexer.l"
+{ return_token_or_DOT(require_ARB_fp, DEPTH); }
YY_BREAK
case 87:
YY_RULE_SETUP
-#line 264 "program_lexer.l"
-{ return INVTRANS; }
+#line 267 "program_lexer.l"
+{ return DIFFUSE; }
YY_BREAK
case 88:
YY_RULE_SETUP
-#line 265 "program_lexer.l"
-{ return LIGHT; }
+#line 268 "program_lexer.l"
+{ return DIRECTION; }
YY_BREAK
case 89:
YY_RULE_SETUP
-#line 266 "program_lexer.l"
-{ return LIGHTMODEL; }
+#line 269 "program_lexer.l"
+{ return EMISSION; }
YY_BREAK
case 90:
YY_RULE_SETUP
-#line 267 "program_lexer.l"
-{ return LIGHTPROD; }
+#line 270 "program_lexer.l"
+{ return ENV; }
YY_BREAK
case 91:
YY_RULE_SETUP
-#line 268 "program_lexer.l"
-{ return LOCAL; }
+#line 271 "program_lexer.l"
+{ return EYE; }
YY_BREAK
case 92:
YY_RULE_SETUP
-#line 269 "program_lexer.l"
-{ return MATERIAL; }
+#line 272 "program_lexer.l"
+{ return FOGCOORD; }
YY_BREAK
case 93:
YY_RULE_SETUP
-#line 270 "program_lexer.l"
-{ return MAT_PROGRAM; }
+#line 273 "program_lexer.l"
+{ return FOG; }
YY_BREAK
case 94:
YY_RULE_SETUP
-#line 271 "program_lexer.l"
-{ return MATRIX; }
+#line 274 "program_lexer.l"
+{ return FRONT; }
YY_BREAK
case 95:
YY_RULE_SETUP
-#line 272 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, MATRIXINDEX); }
+#line 275 "program_lexer.l"
+{ return HALF; }
YY_BREAK
case 96:
YY_RULE_SETUP
-#line 273 "program_lexer.l"
-{ return MODELVIEW; }
+#line 276 "program_lexer.l"
+{ return INVERSE; }
YY_BREAK
case 97:
YY_RULE_SETUP
-#line 274 "program_lexer.l"
-{ return MVP; }
+#line 277 "program_lexer.l"
+{ return INVTRANS; }
YY_BREAK
case 98:
YY_RULE_SETUP
-#line 275 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, NORMAL); }
+#line 278 "program_lexer.l"
+{ return LIGHT; }
YY_BREAK
case 99:
YY_RULE_SETUP
-#line 276 "program_lexer.l"
-{ return OBJECT; }
+#line 279 "program_lexer.l"
+{ return LIGHTMODEL; }
YY_BREAK
case 100:
YY_RULE_SETUP
-#line 277 "program_lexer.l"
-{ return PALETTE; }
+#line 280 "program_lexer.l"
+{ return LIGHTPROD; }
YY_BREAK
case 101:
YY_RULE_SETUP
-#line 278 "program_lexer.l"
-{ return PARAMS; }
+#line 281 "program_lexer.l"
+{ return LOCAL; }
YY_BREAK
case 102:
YY_RULE_SETUP
-#line 279 "program_lexer.l"
-{ return PLANE; }
+#line 282 "program_lexer.l"
+{ return MATERIAL; }
YY_BREAK
case 103:
YY_RULE_SETUP
-#line 280 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, POINT_TOK); }
+#line 283 "program_lexer.l"
+{ return MAT_PROGRAM; }
YY_BREAK
case 104:
YY_RULE_SETUP
-#line 281 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, POINTSIZE); }
+#line 284 "program_lexer.l"
+{ return MATRIX; }
YY_BREAK
case 105:
YY_RULE_SETUP
-#line 282 "program_lexer.l"
-{ return POSITION; }
+#line 285 "program_lexer.l"
+{ return_token_or_DOT(require_ARB_vp, MATRIXINDEX); }
YY_BREAK
case 106:
YY_RULE_SETUP
-#line 283 "program_lexer.l"
-{ return PRIMARY; }
+#line 286 "program_lexer.l"
+{ return MODELVIEW; }
YY_BREAK
case 107:
YY_RULE_SETUP
-#line 284 "program_lexer.l"
-{ return PROJECTION; }
+#line 287 "program_lexer.l"
+{ return MVP; }
YY_BREAK
case 108:
YY_RULE_SETUP
-#line 285 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_fp, RANGE); }
+#line 288 "program_lexer.l"
+{ return_token_or_DOT(require_ARB_vp, NORMAL); }
YY_BREAK
case 109:
YY_RULE_SETUP
-#line 286 "program_lexer.l"
-{ return ROW; }
+#line 289 "program_lexer.l"
+{ return OBJECT; }
YY_BREAK
case 110:
YY_RULE_SETUP
-#line 287 "program_lexer.l"
-{ return SCENECOLOR; }
+#line 290 "program_lexer.l"
+{ return PALETTE; }
YY_BREAK
case 111:
YY_RULE_SETUP
-#line 288 "program_lexer.l"
-{ return SECONDARY; }
+#line 291 "program_lexer.l"
+{ return PARAMS; }
YY_BREAK
case 112:
YY_RULE_SETUP
-#line 289 "program_lexer.l"
-{ return SHININESS; }
+#line 292 "program_lexer.l"
+{ return PLANE; }
YY_BREAK
case 113:
YY_RULE_SETUP
-#line 290 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, SIZE_TOK); }
+#line 293 "program_lexer.l"
+{ return_token_or_DOT(require_ARB_vp, POINT_TOK); }
YY_BREAK
case 114:
YY_RULE_SETUP
-#line 291 "program_lexer.l"
-{ return SPECULAR; }
+#line 294 "program_lexer.l"
+{ return_token_or_DOT(require_ARB_vp, POINTSIZE); }
YY_BREAK
case 115:
YY_RULE_SETUP
-#line 292 "program_lexer.l"
-{ return SPOT; }
+#line 295 "program_lexer.l"
+{ return POSITION; }
YY_BREAK
case 116:
YY_RULE_SETUP
-#line 293 "program_lexer.l"
-{ return TEXCOORD; }
+#line 296 "program_lexer.l"
+{ return PRIMARY; }
YY_BREAK
case 117:
YY_RULE_SETUP
-#line 294 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_fp, TEXENV); }
+#line 297 "program_lexer.l"
+{ return PROJECTION; }
YY_BREAK
case 118:
YY_RULE_SETUP
-#line 295 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, TEXGEN); }
+#line 298 "program_lexer.l"
+{ return_token_or_DOT(require_ARB_fp, RANGE); }
YY_BREAK
case 119:
YY_RULE_SETUP
-#line 296 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, TEXGEN_Q); }
+#line 299 "program_lexer.l"
+{ return ROW; }
YY_BREAK
case 120:
YY_RULE_SETUP
-#line 297 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, TEXGEN_S); }
+#line 300 "program_lexer.l"
+{ return SCENECOLOR; }
YY_BREAK
case 121:
YY_RULE_SETUP
-#line 298 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, TEXGEN_T); }
+#line 301 "program_lexer.l"
+{ return SECONDARY; }
YY_BREAK
case 122:
YY_RULE_SETUP
-#line 299 "program_lexer.l"
-{ return TEXTURE; }
+#line 302 "program_lexer.l"
+{ return SHININESS; }
YY_BREAK
case 123:
YY_RULE_SETUP
-#line 300 "program_lexer.l"
-{ return TRANSPOSE; }
+#line 303 "program_lexer.l"
+{ return_token_or_DOT(require_ARB_vp, SIZE_TOK); }
YY_BREAK
case 124:
YY_RULE_SETUP
-#line 301 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, VTXATTRIB); }
+#line 304 "program_lexer.l"
+{ return SPECULAR; }
YY_BREAK
case 125:
YY_RULE_SETUP
-#line 302 "program_lexer.l"
-{ return_token_or_DOT(require_ARB_vp, WEIGHT); }
+#line 305 "program_lexer.l"
+{ return SPOT; }
YY_BREAK
case 126:
YY_RULE_SETUP
-#line 304 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp, TEXTURE_UNIT); }
+#line 306 "program_lexer.l"
+{ return TEXCOORD; }
YY_BREAK
case 127:
YY_RULE_SETUP
-#line 305 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_1D); }
+#line 307 "program_lexer.l"
+{ return_token_or_DOT(require_ARB_fp, TEXENV); }
YY_BREAK
case 128:
YY_RULE_SETUP
-#line 306 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_2D); }
+#line 308 "program_lexer.l"
+{ return_token_or_DOT(require_ARB_vp, TEXGEN); }
YY_BREAK
case 129:
YY_RULE_SETUP
-#line 307 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_3D); }
+#line 309 "program_lexer.l"
+{ return_token_or_DOT(require_ARB_vp, TEXGEN_Q); }
YY_BREAK
case 130:
YY_RULE_SETUP
-#line 308 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_CUBE); }
+#line 310 "program_lexer.l"
+{ return_token_or_DOT(require_ARB_vp, TEXGEN_S); }
YY_BREAK
case 131:
YY_RULE_SETUP
-#line 309 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_rect, TEX_RECT); }
+#line 311 "program_lexer.l"
+{ return_token_or_DOT(require_ARB_vp, TEXGEN_T); }
YY_BREAK
case 132:
YY_RULE_SETUP
-#line 310 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow, TEX_SHADOW1D); }
+#line 312 "program_lexer.l"
+{ return TEXTURE; }
YY_BREAK
case 133:
YY_RULE_SETUP
-#line 311 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow, TEX_SHADOW2D); }
+#line 313 "program_lexer.l"
+{ return TRANSPOSE; }
YY_BREAK
case 134:
YY_RULE_SETUP
-#line 312 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_rect, TEX_SHADOWRECT); }
+#line 314 "program_lexer.l"
+{ return_token_or_DOT(require_ARB_vp, VTXATTRIB); }
YY_BREAK
case 135:
YY_RULE_SETUP
-#line 313 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_texarray, TEX_ARRAY1D); }
+#line 315 "program_lexer.l"
+{ return_token_or_DOT(require_ARB_vp, WEIGHT); }
YY_BREAK
case 136:
YY_RULE_SETUP
-#line 314 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_texarray, TEX_ARRAY2D); }
+#line 317 "program_lexer.l"
+{ return_token_or_IDENTIFIER(require_ARB_fp, TEXTURE_UNIT); }
YY_BREAK
case 137:
YY_RULE_SETUP
-#line 315 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_texarray, TEX_ARRAYSHADOW1D); }
+#line 318 "program_lexer.l"
+{ return_token_or_IDENTIFIER(require_ARB_fp || require_NV_vp3, TEX_1D); }
YY_BREAK
case 138:
YY_RULE_SETUP
-#line 316 "program_lexer.l"
-{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_texarray, TEX_ARRAYSHADOW2D); }
+#line 319 "program_lexer.l"
+{ return_token_or_IDENTIFIER(require_ARB_fp || require_NV_vp3, TEX_2D); }
YY_BREAK
case 139:
YY_RULE_SETUP
-#line 318 "program_lexer.l"
-{ return handle_ident(yyextra, yytext, yylval); }
+#line 320 "program_lexer.l"
+{ return_token_or_IDENTIFIER(require_ARB_fp || require_NV_vp3, TEX_3D); }
YY_BREAK
case 140:
YY_RULE_SETUP
-#line 320 "program_lexer.l"
-{ return DOT_DOT; }
+#line 321 "program_lexer.l"
+{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_CUBE); }
YY_BREAK
case 141:
YY_RULE_SETUP
#line 322 "program_lexer.l"
+{ return_token_or_IDENTIFIER(require_ARB_fp && require_rect, TEX_RECT); }
+ YY_BREAK
+case 142:
+YY_RULE_SETUP
+#line 323 "program_lexer.l"
+{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow, TEX_SHADOW1D); }
+ YY_BREAK
+case 143:
+YY_RULE_SETUP
+#line 324 "program_lexer.l"
+{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow, TEX_SHADOW2D); }
+ YY_BREAK
+case 144:
+YY_RULE_SETUP
+#line 325 "program_lexer.l"
+{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_rect, TEX_SHADOWRECT); }
+ YY_BREAK
+case 145:
+YY_RULE_SETUP
+#line 326 "program_lexer.l"
+{ return_token_or_IDENTIFIER(require_ARB_fp && require_texarray, TEX_ARRAY1D); }
+ YY_BREAK
+case 146:
+YY_RULE_SETUP
+#line 327 "program_lexer.l"
+{ return_token_or_IDENTIFIER(require_ARB_fp && require_texarray, TEX_ARRAY2D); }
+ YY_BREAK
+case 147:
+YY_RULE_SETUP
+#line 328 "program_lexer.l"
+{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_texarray, TEX_ARRAYSHADOW1D); }
+ YY_BREAK
+case 148:
+YY_RULE_SETUP
+#line 329 "program_lexer.l"
+{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_texarray, TEX_ARRAYSHADOW2D); }
+ YY_BREAK
+case 149:
+YY_RULE_SETUP
+#line 331 "program_lexer.l"
+{ return handle_ident(yyextra, yytext, yylval); }
+ YY_BREAK
+case 150:
+YY_RULE_SETUP
+#line 333 "program_lexer.l"
+{ return DOT_DOT; }
+ YY_BREAK
+case 151:
+YY_RULE_SETUP
+#line 335 "program_lexer.l"
{
yylval->integer = strtol(yytext, NULL, 10);
return INTEGER;
}
YY_BREAK
-case 142:
+case 152:
YY_RULE_SETUP
-#line 326 "program_lexer.l"
+#line 339 "program_lexer.l"
{
yylval->real = _mesa_strtod(yytext, NULL);
return REAL;
}
YY_BREAK
-case 143:
-/* rule 143 can match eol */
+case 153:
+/* rule 153 can match eol */
*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */
yyg->yy_c_buf_p = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 330 "program_lexer.l"
+#line 343 "program_lexer.l"
{
yylval->real = _mesa_strtod(yytext, NULL);
return REAL;
}
YY_BREAK
-case 144:
+case 154:
YY_RULE_SETUP
-#line 334 "program_lexer.l"
+#line 347 "program_lexer.l"
{
yylval->real = _mesa_strtod(yytext, NULL);
return REAL;
}
YY_BREAK
-case 145:
+case 155:
YY_RULE_SETUP
-#line 338 "program_lexer.l"
+#line 351 "program_lexer.l"
{
yylval->real = _mesa_strtod(yytext, NULL);
return REAL;
}
YY_BREAK
-case 146:
+case 156:
YY_RULE_SETUP
-#line 343 "program_lexer.l"
+#line 356 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_NOOP;
yylval->swiz_mask.mask = WRITEMASK_XYZW;
return MASK4;
}
YY_BREAK
-case 147:
+case 157:
YY_RULE_SETUP
-#line 349 "program_lexer.l"
+#line 362 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_XY
@@ -2250,27 +2373,27 @@ YY_RULE_SETUP
return MASK3;
}
YY_BREAK
-case 148:
+case 158:
YY_RULE_SETUP
-#line 355 "program_lexer.l"
+#line 368 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_XZW;
return MASK3;
}
YY_BREAK
-case 149:
+case 159:
YY_RULE_SETUP
-#line 360 "program_lexer.l"
+#line 373 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_YZW;
return MASK3;
}
YY_BREAK
-case 150:
+case 160:
YY_RULE_SETUP
-#line 366 "program_lexer.l"
+#line 379 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_X
@@ -2278,9 +2401,9 @@ YY_RULE_SETUP
return MASK2;
}
YY_BREAK
-case 151:
+case 161:
YY_RULE_SETUP
-#line 372 "program_lexer.l"
+#line 385 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_Y
@@ -2288,18 +2411,18 @@ YY_RULE_SETUP
return MASK2;
}
YY_BREAK
-case 152:
+case 162:
YY_RULE_SETUP
-#line 378 "program_lexer.l"
+#line 391 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_ZW;
return MASK2;
}
YY_BREAK
-case 153:
+case 163:
YY_RULE_SETUP
-#line 384 "program_lexer.l"
+#line 397 "program_lexer.l"
{
const unsigned s = swiz_from_char(yytext[1]);
yylval->swiz_mask.swizzle = MAKE_SWIZZLE4(s, s, s, s);
@@ -2307,9 +2430,9 @@ YY_RULE_SETUP
return MASK1;
}
YY_BREAK
-case 154:
+case 164:
YY_RULE_SETUP
-#line 391 "program_lexer.l"
+#line 404 "program_lexer.l"
{
yylval->swiz_mask.swizzle = MAKE_SWIZZLE4(swiz_from_char(yytext[1]),
swiz_from_char(yytext[2]),
@@ -2319,18 +2442,18 @@ YY_RULE_SETUP
return SWIZZLE;
}
YY_BREAK
-case 155:
+case 165:
YY_RULE_SETUP
-#line 400 "program_lexer.l"
+#line 413 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_NOOP;
yylval->swiz_mask.mask = WRITEMASK_XYZW;
return_token_or_DOT(require_ARB_fp, MASK4);
}
YY_BREAK
-case 156:
+case 166:
YY_RULE_SETUP
-#line 406 "program_lexer.l"
+#line 419 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_XY
@@ -2338,27 +2461,27 @@ YY_RULE_SETUP
return_token_or_DOT(require_ARB_fp, MASK3);
}
YY_BREAK
-case 157:
+case 167:
YY_RULE_SETUP
-#line 412 "program_lexer.l"
+#line 425 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_XZW;
return_token_or_DOT(require_ARB_fp, MASK3);
}
YY_BREAK
-case 158:
+case 168:
YY_RULE_SETUP
-#line 417 "program_lexer.l"
+#line 430 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_YZW;
return_token_or_DOT(require_ARB_fp, MASK3);
}
YY_BREAK
-case 159:
+case 169:
YY_RULE_SETUP
-#line 423 "program_lexer.l"
+#line 436 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_X
@@ -2366,9 +2489,9 @@ YY_RULE_SETUP
return_token_or_DOT(require_ARB_fp, MASK2);
}
YY_BREAK
-case 160:
+case 170:
YY_RULE_SETUP
-#line 429 "program_lexer.l"
+#line 442 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_Y
@@ -2376,18 +2499,18 @@ YY_RULE_SETUP
return_token_or_DOT(require_ARB_fp, MASK2);
}
YY_BREAK
-case 161:
+case 171:
YY_RULE_SETUP
-#line 435 "program_lexer.l"
+#line 448 "program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_ZW;
return_token_or_DOT(require_ARB_fp, MASK2);
}
YY_BREAK
-case 162:
+case 172:
YY_RULE_SETUP
-#line 441 "program_lexer.l"
+#line 454 "program_lexer.l"
{
const unsigned s = swiz_from_char(yytext[1]);
yylval->swiz_mask.swizzle = MAKE_SWIZZLE4(s, s, s, s);
@@ -2395,9 +2518,9 @@ YY_RULE_SETUP
return_token_or_DOT(require_ARB_fp, MASK1);
}
YY_BREAK
-case 163:
+case 173:
YY_RULE_SETUP
-#line 449 "program_lexer.l"
+#line 462 "program_lexer.l"
{
if (require_ARB_vp) {
return TEXGEN_R;
@@ -2409,9 +2532,9 @@ YY_RULE_SETUP
}
}
YY_BREAK
-case 164:
+case 174:
YY_RULE_SETUP
-#line 460 "program_lexer.l"
+#line 473 "program_lexer.l"
{
yylval->swiz_mask.swizzle = MAKE_SWIZZLE4(swiz_from_char(yytext[1]),
swiz_from_char(yytext[2]),
@@ -2421,15 +2544,15 @@ YY_RULE_SETUP
return_token_or_DOT(require_ARB_fp, SWIZZLE);
}
YY_BREAK
-case 165:
+case 175:
YY_RULE_SETUP
-#line 469 "program_lexer.l"
+#line 482 "program_lexer.l"
{ return DOT; }
YY_BREAK
-case 166:
-/* rule 166 can match eol */
+case 176:
+/* rule 176 can match eol */
YY_RULE_SETUP
-#line 471 "program_lexer.l"
+#line 484 "program_lexer.l"
{
yylloc->first_line++;
yylloc->first_column = 1;
@@ -2438,30 +2561,30 @@ YY_RULE_SETUP
yylloc->position++;
}
YY_BREAK
-case 167:
+case 177:
YY_RULE_SETUP
-#line 478 "program_lexer.l"
+#line 491 "program_lexer.l"
/* eat whitespace */ ;
YY_BREAK
-case 168:
+case 178:
*yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */
yyg->yy_c_buf_p = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 479 "program_lexer.l"
+#line 492 "program_lexer.l"
/* eat comments */ ;
YY_BREAK
-case 169:
+case 179:
YY_RULE_SETUP
-#line 480 "program_lexer.l"
+#line 493 "program_lexer.l"
{ return yytext[0]; }
YY_BREAK
-case 170:
+case 180:
YY_RULE_SETUP
-#line 481 "program_lexer.l"
+#line 494 "program_lexer.l"
ECHO;
YY_BREAK
-#line 2465 "lex.yy.c"
+#line 2588 "lex.yy.c"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -2755,7 +2878,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 850 )
+ if ( yy_current_state >= 916 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2784,11 +2907,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 850 )
+ if ( yy_current_state >= 916 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- yy_is_jam = (yy_current_state == 849);
+ yy_is_jam = (yy_current_state == 915);
return yy_is_jam ? 0 : yy_current_state;
}
@@ -3229,8 +3352,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr , yyscan_t yyscanner)
/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
* scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
* @param yyscanner The scanner object.
* @return the newly allocated buffer state object.
*/
@@ -3636,7 +3759,7 @@ void yyfree (void * ptr , yyscan_t yyscanner)
#define YYTABLES_NAME "yytables"
-#line 481 "program_lexer.l"
+#line 494 "program_lexer.l"
diff --git a/src/mesa/shader/prog_execute.c b/src/mesa/shader/prog_execute.c
index 192d39aed1..c23df9592c 100644
--- a/src/mesa/shader/prog_execute.c
+++ b/src/mesa/shader/prog_execute.c
@@ -84,7 +84,7 @@ get_src_register_pointer(const struct prog_src_register *source,
if (source->RelAddr) {
/* add address register value to src index/offset */
- reg += machine->AddressReg[0][0];
+ reg += machine->AddressReg[source->AddrReg][source->AddrComponent];
if (reg < 0) {
return ZeroVec;
}
@@ -134,6 +134,11 @@ get_src_register_pointer(const struct prog_src_register *source,
return ZeroVec;
return prog->Parameters->ParameterValues[reg];
+ case PROGRAM_ADDRESS:
+ if (reg >= MAX_PROGRAM_ADDRESS_REGS)
+ return ZeroVec;
+ return (GLfloat *) machine->AddressReg[reg];
+
default:
_mesa_problem(NULL,
"Invalid src register file %d in get_src_register_pointer()",
@@ -176,6 +181,11 @@ get_dst_register_pointer(const struct prog_dst_register *dest,
case PROGRAM_WRITE_ONLY:
return dummyReg;
+ case PROGRAM_ADDRESS:
+ if (reg >= MAX_PROGRAM_ADDRESS_REGS)
+ return dummyReg;
+ return (GLfloat *) machine->AddressReg[reg];
+
default:
_mesa_problem(NULL,
"Invalid dest register file %d in get_dst_register_pointer()",
@@ -665,11 +675,46 @@ _mesa_execute_program(GLcontext * ctx,
store_vector4ui(inst, machine, result);
}
break;
+ case OPCODE_ARA:
+ {
+ GLuint *v;
+ GLuint result[4];
+
+ v = (GLuint *) get_src_register_pointer(&inst->SrcReg[0], machine);
+ result[0] = v[0] + v[2];
+ result[1] = v[1] + v[3];
+ result[2] = v[0] + v[2];
+ result[3] = v[1] + v[3];
+
+ store_vector4ui(inst, machine, result);
+ }
+ break;
case OPCODE_ARL:
{
GLfloat t[4];
+ GLuint result[4];
+
+ fetch_vector4(&inst->SrcReg[0], machine, t);
+ result[0] = IFLOOR(t[0]);
+ result[1] = IFLOOR(t[1]);
+ result[2] = IFLOOR(t[2]);
+ result[3] = IFLOOR(t[3]);
+
+ store_vector4ui(inst, machine, result);
+ }
+ break;
+ case OPCODE_ARR:
+ {
+ GLfloat t[4];
+ GLuint result[4];
+
fetch_vector4(&inst->SrcReg[0], machine, t);
- machine->AddressReg[0][0] = IFLOOR(t[0]);
+ result[0] = IROUND(t[0]);
+ result[1] = IROUND(t[1]);
+ result[2] = IROUND(t[2]);
+ result[3] = IROUND(t[3]);
+
+ store_vector4ui(inst, machine, result);
}
break;
case OPCODE_BGNLOOP:
diff --git a/src/mesa/shader/prog_instruction.h b/src/mesa/shader/prog_instruction.h
index 1c687bc16c..84d077b2d3 100644
--- a/src/mesa/shader/prog_instruction.h
+++ b/src/mesa/shader/prog_instruction.h
@@ -261,6 +261,18 @@ struct prog_src_register
GLuint Swizzle:12;
GLuint RelAddr:1;
+ /**
+ * Address register selector.
+ *
+ * NV_vertex_program3 only supports two address registers.
+ */
+ GLuint AddrReg:1;
+
+ /**
+ * Select the X, Y, Z, or W component of the address register
+ */
+ GLuint AddrComponent:2;
+
/** Take the component-wise absolute value */
GLuint Abs:1;
diff --git a/src/mesa/shader/program_lexer.l b/src/mesa/shader/program_lexer.l
index e2acb3c0c9..25fcaa7446 100644
--- a/src/mesa/shader/program_lexer.l
+++ b/src/mesa/shader/program_lexer.l
@@ -33,6 +33,8 @@
#define require_ARB_vp (yyextra->mode == ARB_vertex)
#define require_ARB_fp (yyextra->mode == ARB_fragment)
#define require_NV_fp (yyextra->option.NV_fragment)
+#define require_NV_vp2 (yyextra->option.NV_vertex2)
+#define require_NV_vp3 (yyextra->option.NV_vertex3)
#define require_shadow (yyextra->option.Shadow)
#define require_rect (yyextra->option.TexRect)
#define require_texarray (yyextra->option.TexArray)
@@ -63,7 +65,7 @@
#define return_opcode(condition, token, opcode, len) \
do { \
- if (condition && \
+ if ((condition) && \
_mesa_parse_instruction_suffix(yyextra, \
yytext + len, \
& yylval->temp_inst)) { \
@@ -150,7 +152,7 @@ dot "."[ \t]*
sz [HRX]?
szf [HR]?
-cc C?
+cc (C[01]?)?
sat (_SAT)?
%option bison-bridge bison-locations reentrant noyywrap
@@ -172,10 +174,15 @@ TEMP { yylval->integer = at_temp; return TEMP; }
ABS{sz}{cc}{sat} { return_opcode( 1, VECTOR_OP, ABS, 3); }
ADD{sz}{cc}{sat} { return_opcode( 1, BIN_OP, ADD, 3); }
-ARL { return_opcode(require_ARB_vp, ARL, ARL, 3); }
+ARA { return_opcode(require_NV_vp2, ARA_OP, ARA, 3); }
+ARL { return_opcode(require_ARB_vp, (require_NV_vp2) ? ARL_NV_OP : ARL_OP, ARL, 3); }
+ARR { return_opcode(require_NV_vp2, ARL_OP, ARR, 3); }
+BRA { return_opcode(require_NV_vp2, BRA_OP, BRA, 3); }
+
+CAL { return_opcode(require_NV_vp2, BRA_OP, CAL, 3); }
CMP{sat} { return_opcode(require_ARB_fp, TRI_OP, CMP, 3); }
-COS{szf}{cc}{sat} { return_opcode(require_ARB_fp, SCALAR_OP, COS, 3); }
+COS{szf}{cc}{sat} { return_opcode(require_ARB_fp || require_NV_vp2, SCALAR_OP, COS, 3); }
DDX{szf}{cc}{sat} { return_opcode(require_NV_fp, VECTOR_OP, DDX, 3); }
DDY{szf}{cc}{sat} { return_opcode(require_NV_fp, VECTOR_OP, DDY, 3); }
@@ -207,29 +214,35 @@ PK2H { return_opcode(require_NV_fp, VECTOR_OP, PK2H, 4); }
PK2US { return_opcode(require_NV_fp, VECTOR_OP, PK2US, 5); }
PK4B { return_opcode(require_NV_fp, VECTOR_OP, PK4B, 4); }
PK4UB { return_opcode(require_NV_fp, VECTOR_OP, PK4UB, 5); }
+PUSHA { return_opcode(require_NV_vp3, PUSHA_OP, PUSHA, 5); }
+POPA { return_opcode(require_NV_vp3, POPA_OP, POPA, 4); }
POW{szf}{cc}{sat} { return_opcode( 1, BINSC_OP, POW, 3); }
+RET { return_opcode(require_NV_vp2, FLOW_OP, RET, 3); }
RCP{szf}{cc}{sat} { return_opcode( 1, SCALAR_OP, RCP, 3); }
+RCC{cc} { return_opcode(require_NV_vp2, SCALAR_OP, RCC, 3); }
RFL{szf}{cc}{sat} { return_opcode(require_NV_fp, BIN_OP, RFL, 3); }
RSQ{szf}{cc}{sat} { return_opcode( 1, SCALAR_OP, RSQ, 3); }
SCS{sat} { return_opcode(require_ARB_fp, SCALAR_OP, SCS, 3); }
-SEQ{sz}{cc}{sat} { return_opcode(require_NV_fp, BIN_OP, SEQ, 3); }
-SFL{sz}{cc}{sat} { return_opcode(require_NV_fp, BIN_OP, SFL, 3); }
+SEQ{sz}{cc}{sat} { return_opcode(require_NV_fp || require_NV_vp2, BIN_OP, SEQ, 3); }
+SFL{sz}{cc}{sat} { return_opcode(require_NV_fp || require_NV_vp2, BIN_OP, SFL, 3); }
SGE{sz}{cc}{sat} { return_opcode( 1, BIN_OP, SGE, 3); }
-SGT{sz}{cc}{sat} { return_opcode(require_NV_fp, BIN_OP, SGT, 3); }
-SIN{szf}{cc}{sat} { return_opcode(require_ARB_fp, SCALAR_OP, SIN, 3); }
-SLE{sz}{cc}{sat} { return_opcode(require_NV_fp, BIN_OP, SLE, 3); }
+SGT{sz}{cc}{sat} { return_opcode(require_NV_fp || require_NV_vp2, BIN_OP, SGT, 3); }
+SIN{szf}{cc}{sat} { return_opcode(require_ARB_fp || require_NV_vp2, SCALAR_OP, SIN, 3); }
+SLE{sz}{cc}{sat} { return_opcode(require_NV_fp || require_NV_vp2, BIN_OP, SLE, 3); }
SLT{sz}{cc}{sat} { return_opcode( 1, BIN_OP, SLT, 3); }
-SNE{sz}{cc}{sat} { return_opcode(require_NV_fp, BIN_OP, SNE, 3); }
-STR{sz}{cc}{sat} { return_opcode(require_NV_fp, BIN_OP, STR, 3); }
+SNE{sz}{cc}{sat} { return_opcode(require_NV_fp || require_NV_vp2, BIN_OP, SNE, 3); }
+SSG{cc} { return_opcode(require_NV_vp2, VECTOR_OP, SSG, 3); }
+STR{sz}{cc}{sat} { return_opcode(require_NV_fp || require_NV_vp2, BIN_OP, STR, 3); }
SUB{sz}{cc}{sat} { return_opcode( 1, BIN_OP, SUB, 3); }
SWZ{sat} { return_opcode( 1, SWZ, SWZ, 3); }
-TEX{cc}{sat} { return_opcode(require_ARB_fp, SAMPLE_OP, TEX, 3); }
-TXB{cc}{sat} { return_opcode(require_ARB_fp, SAMPLE_OP, TXB, 3); }
+TEX{cc}{sat} { return_opcode(require_ARB_fp || require_NV_vp3, SAMPLE_OP, TEX, 3); }
+TXB{cc}{sat} { return_opcode(require_ARB_fp || require_NV_vp3, SAMPLE_OP, TXB, 3); }
TXD{cc}{sat} { return_opcode(require_NV_fp, TXD_OP, TXD, 3); }
-TXP{cc}{sat} { return_opcode(require_ARB_fp, SAMPLE_OP, TXP, 3); }
+TXL{cc} { return_opcode(require_NV_vp3, SAMPLE_OP, TXP, 3); }
+TXP{cc}{sat} { return_opcode(require_ARB_fp || require_NV_vp3, SAMPLE_OP, TXP, 3); }
UP2H{cc}{sat} { return_opcode(require_NV_fp, SCALAR_OP, UP2H, 4); }
UP2US{cc}{sat} { return_opcode(require_NV_fp, SCALAR_OP, UP2US, 5); }
@@ -302,9 +315,9 @@ result { return RESULT; }
{dot}weight { return_token_or_DOT(require_ARB_vp, WEIGHT); }
texture { return_token_or_IDENTIFIER(require_ARB_fp, TEXTURE_UNIT); }
-1D { return_token_or_IDENTIFIER(require_ARB_fp, TEX_1D); }
-2D { return_token_or_IDENTIFIER(require_ARB_fp, TEX_2D); }
-3D { return_token_or_IDENTIFIER(require_ARB_fp, TEX_3D); }
+1D { return_token_or_IDENTIFIER(require_ARB_fp || require_NV_vp3, TEX_1D); }
+2D { return_token_or_IDENTIFIER(require_ARB_fp || require_NV_vp3, TEX_2D); }
+3D { return_token_or_IDENTIFIER(require_ARB_fp || require_NV_vp3, TEX_3D); }
CUBE { return_token_or_IDENTIFIER(require_ARB_fp, TEX_CUBE); }
RECT { return_token_or_IDENTIFIER(require_ARB_fp && require_rect, TEX_RECT); }
SHADOW1D { return_token_or_IDENTIFIER(require_ARB_fp && require_shadow, TEX_SHADOW1D); }
diff --git a/src/mesa/shader/program_parse.tab.c b/src/mesa/shader/program_parse.tab.c
index c0f50147bd..395461d021 100644
--- a/src/mesa/shader/program_parse.tab.c
+++ b/src/mesa/shader/program_parse.tab.c
@@ -177,9 +177,14 @@ static struct asm_instruction *asm_instruction_copy_ctor(
#define YYLEX_PARAM state->scanner
+#define SWIZZLE_XXXX MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_X, SWIZZLE_X, SWIZZLE_X)
+#define SWIZZLE_YYYY MAKE_SWIZZLE4(SWIZZLE_Y, SWIZZLE_Y, SWIZZLE_Y, SWIZZLE_Y)
+#define SWIZZLE_ZZZZ MAKE_SWIZZLE4(SWIZZLE_Z, SWIZZLE_Z, SWIZZLE_Z, SWIZZLE_Z)
+#define SWIZZLE_WWWW MAKE_SWIZZLE4(SWIZZLE_W, SWIZZLE_W, SWIZZLE_W, SWIZZLE_W)
+
/* Line 189 of yacc.c */
-#line 183 "program_parse.tab.c"
+#line 188 "program_parse.tab.c"
/* Enabling traces. */
#ifndef YYDEBUG
@@ -222,95 +227,101 @@ static struct asm_instruction *asm_instruction_copy_ctor(
SCALAR_OP = 271,
TRI_OP = 272,
VECTOR_OP = 273,
- ARL = 274,
- KIL = 275,
- SWZ = 276,
- TXD_OP = 277,
- INTEGER = 278,
- REAL = 279,
- AMBIENT = 280,
- ATTENUATION = 281,
- BACK = 282,
- CLIP = 283,
- COLOR = 284,
- DEPTH = 285,
- DIFFUSE = 286,
- DIRECTION = 287,
- EMISSION = 288,
- ENV = 289,
- EYE = 290,
- FOG = 291,
- FOGCOORD = 292,
- FRAGMENT = 293,
- FRONT = 294,
- HALF = 295,
- INVERSE = 296,
- INVTRANS = 297,
- LIGHT = 298,
- LIGHTMODEL = 299,
- LIGHTPROD = 300,
- LOCAL = 301,
- MATERIAL = 302,
- MAT_PROGRAM = 303,
- MATRIX = 304,
- MATRIXINDEX = 305,
- MODELVIEW = 306,
- MVP = 307,
- NORMAL = 308,
- OBJECT = 309,
- PALETTE = 310,
- PARAMS = 311,
- PLANE = 312,
- POINT_TOK = 313,
- POINTSIZE = 314,
- POSITION = 315,
- PRIMARY = 316,
- PROGRAM = 317,
- PROJECTION = 318,
- RANGE = 319,
- RESULT = 320,
- ROW = 321,
- SCENECOLOR = 322,
- SECONDARY = 323,
- SHININESS = 324,
- SIZE_TOK = 325,
- SPECULAR = 326,
- SPOT = 327,
- STATE = 328,
- TEXCOORD = 329,
- TEXENV = 330,
- TEXGEN = 331,
- TEXGEN_Q = 332,
- TEXGEN_R = 333,
- TEXGEN_S = 334,
- TEXGEN_T = 335,
- TEXTURE = 336,
- TRANSPOSE = 337,
- TEXTURE_UNIT = 338,
- TEX_1D = 339,
- TEX_2D = 340,
- TEX_3D = 341,
- TEX_CUBE = 342,
- TEX_RECT = 343,
- TEX_SHADOW1D = 344,
- TEX_SHADOW2D = 345,
- TEX_SHADOWRECT = 346,
- TEX_ARRAY1D = 347,
- TEX_ARRAY2D = 348,
- TEX_ARRAYSHADOW1D = 349,
- TEX_ARRAYSHADOW2D = 350,
- VERTEX = 351,
- VTXATTRIB = 352,
- WEIGHT = 353,
- IDENTIFIER = 354,
- USED_IDENTIFIER = 355,
- MASK4 = 356,
- MASK3 = 357,
- MASK2 = 358,
- MASK1 = 359,
- SWIZZLE = 360,
- DOT_DOT = 361,
- DOT = 362
+ KIL = 274,
+ SWZ = 275,
+ TXD_OP = 276,
+ BRA_OP = 277,
+ FLOW_OP = 278,
+ ARL_OP = 279,
+ ARL_NV_OP = 280,
+ ARA_OP = 281,
+ PUSHA_OP = 282,
+ POPA_OP = 283,
+ INTEGER = 284,
+ REAL = 285,
+ AMBIENT = 286,
+ ATTENUATION = 287,
+ BACK = 288,
+ CLIP = 289,
+ COLOR = 290,
+ DEPTH = 291,
+ DIFFUSE = 292,
+ DIRECTION = 293,
+ EMISSION = 294,
+ ENV = 295,
+ EYE = 296,
+ FOG = 297,
+ FOGCOORD = 298,
+ FRAGMENT = 299,
+ FRONT = 300,
+ HALF = 301,
+ INVERSE = 302,
+ INVTRANS = 303,
+ LIGHT = 304,
+ LIGHTMODEL = 305,
+ LIGHTPROD = 306,
+ LOCAL = 307,
+ MATERIAL = 308,
+ MAT_PROGRAM = 309,
+ MATRIX = 310,
+ MATRIXINDEX = 311,
+ MODELVIEW = 312,
+ MVP = 313,
+ NORMAL = 314,
+ OBJECT = 315,
+ PALETTE = 316,
+ PARAMS = 317,
+ PLANE = 318,
+ POINT_TOK = 319,
+ POINTSIZE = 320,
+ POSITION = 321,
+ PRIMARY = 322,
+ PROGRAM = 323,
+ PROJECTION = 324,
+ RANGE = 325,
+ RESULT = 326,
+ ROW = 327,
+ SCENECOLOR = 328,
+ SECONDARY = 329,
+ SHININESS = 330,
+ SIZE_TOK = 331,
+ SPECULAR = 332,
+ SPOT = 333,
+ STATE = 334,
+ TEXCOORD = 335,
+ TEXENV = 336,
+ TEXGEN = 337,
+ TEXGEN_Q = 338,
+ TEXGEN_R = 339,
+ TEXGEN_S = 340,
+ TEXGEN_T = 341,
+ TEXTURE = 342,
+ TRANSPOSE = 343,
+ TEXTURE_UNIT = 344,
+ TEX_1D = 345,
+ TEX_2D = 346,
+ TEX_3D = 347,
+ TEX_CUBE = 348,
+ TEX_RECT = 349,
+ TEX_SHADOW1D = 350,
+ TEX_SHADOW2D = 351,
+ TEX_SHADOWRECT = 352,
+ TEX_ARRAY1D = 353,
+ TEX_ARRAY2D = 354,
+ TEX_ARRAYSHADOW1D = 355,
+ TEX_ARRAYSHADOW2D = 356,
+ VERTEX = 357,
+ VTXATTRIB = 358,
+ WEIGHT = 359,
+ IDENTIFIER = 360,
+ USED_IDENTIFIER = 361,
+ MASK4 = 362,
+ MASK3 = 363,
+ MASK2 = 364,
+ MASK1 = 365,
+ SWIZZLE = 366,
+ DOT_DOT = 367,
+ DOT = 368
};
#endif
@@ -321,7 +332,7 @@ typedef union YYSTYPE
{
/* Line 214 of yacc.c */
-#line 116 "program_parse.y"
+#line 121 "program_parse.y"
struct asm_instruction *inst;
struct asm_symbol *sym;
@@ -350,7 +361,7 @@ typedef union YYSTYPE
/* Line 214 of yacc.c */
-#line 354 "program_parse.tab.c"
+#line 365 "program_parse.tab.c"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -374,14 +385,14 @@ typedef struct YYLTYPE
/* Copy the second part of user declarations. */
/* Line 264 of yacc.c */
-#line 261 "program_parse.y"
+#line 269 "program_parse.y"
extern int yylex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param,
void *yyscanner);
/* Line 264 of yacc.c */
-#line 385 "program_parse.tab.c"
+#line 396 "program_parse.tab.c"
#ifdef short
# undef short
@@ -598,20 +609,20 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 5
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 396
+#define YYLAST 493
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 120
+#define YYNTOKENS 127
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 143
+#define YYNNTS 151
/* YYNRULES -- Number of rules. */
-#define YYNRULES 282
+#define YYNRULES 301
/* YYNRULES -- Number of states. */
-#define YYNSTATES 475
+#define YYNSTATES 513
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
-#define YYMAXUTOK 362
+#define YYMAXUTOK 368
#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -623,15 +634,15 @@ static const yytype_uint8 yytranslate[] =
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 115, 116, 2, 113, 109, 114, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 108,
- 2, 117, 2, 2, 2, 2, 2, 2, 2, 2,
+ 122, 123, 2, 120, 116, 121, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 115, 114,
+ 2, 124, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 111, 2, 112, 2, 2, 2, 2, 2, 2,
+ 2, 118, 2, 119, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 118, 110, 119, 2, 2, 2, 2,
+ 2, 2, 2, 125, 117, 126, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -655,7 +666,7 @@ static const yytype_uint8 yytranslate[] =
75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107
+ 105, 106, 107, 108, 109, 110, 111, 112, 113
};
#if YYDEBUG
@@ -664,153 +675,163 @@ static const yytype_uint8 yytranslate[] =
static const yytype_uint16 yyprhs[] =
{
0, 0, 3, 8, 10, 12, 15, 16, 20, 23,
- 24, 27, 30, 32, 34, 36, 38, 40, 42, 44,
- 46, 48, 50, 52, 54, 59, 64, 69, 76, 83,
- 92, 101, 104, 107, 120, 123, 125, 127, 129, 131,
- 133, 135, 137, 139, 141, 143, 145, 147, 154, 157,
- 162, 165, 167, 171, 177, 181, 184, 192, 195, 197,
- 199, 201, 203, 208, 210, 212, 214, 216, 218, 220,
- 222, 226, 227, 230, 233, 235, 237, 239, 241, 243,
- 245, 247, 249, 251, 252, 254, 256, 258, 260, 261,
- 265, 269, 270, 273, 276, 278, 280, 282, 284, 286,
- 288, 290, 292, 297, 300, 303, 305, 308, 310, 313,
- 315, 318, 323, 328, 330, 331, 335, 337, 339, 342,
- 344, 347, 349, 351, 355, 362, 363, 365, 368, 373,
- 375, 379, 381, 383, 385, 387, 389, 391, 393, 395,
- 397, 399, 402, 405, 408, 411, 414, 417, 420, 423,
- 426, 429, 432, 435, 439, 441, 443, 445, 451, 453,
- 455, 457, 460, 462, 464, 467, 469, 472, 479, 481,
- 485, 487, 489, 491, 493, 495, 500, 502, 504, 506,
- 508, 510, 512, 515, 517, 519, 525, 527, 530, 532,
- 534, 540, 543, 544, 551, 555, 556, 558, 560, 562,
- 564, 566, 569, 571, 573, 576, 581, 586, 587, 591,
- 593, 595, 597, 600, 602, 604, 606, 608, 614, 616,
- 620, 626, 632, 634, 638, 644, 646, 648, 650, 652,
- 654, 656, 658, 660, 662, 666, 672, 680, 690, 693,
- 696, 698, 700, 701, 702, 707, 709, 710, 711, 715,
- 719, 721, 727, 730, 733, 736, 739, 743, 746, 750,
- 751, 753, 755, 756, 758, 760, 761, 763, 765, 766,
- 768, 770, 771, 775, 776, 780, 781, 785, 787, 789,
- 791, 796, 798
+ 24, 27, 30, 33, 35, 37, 39, 41, 43, 45,
+ 47, 49, 51, 53, 55, 57, 59, 61, 63, 65,
+ 67, 72, 77, 82, 85, 88, 93, 98, 105, 112,
+ 121, 130, 133, 136, 149, 152, 155, 157, 159, 161,
+ 163, 165, 167, 169, 171, 173, 175, 177, 179, 181,
+ 188, 192, 195, 198, 203, 206, 208, 212, 218, 222,
+ 226, 228, 230, 238, 241, 243, 245, 247, 249, 254,
+ 256, 258, 260, 262, 264, 266, 268, 272, 273, 276,
+ 279, 281, 283, 285, 287, 289, 291, 293, 295, 296,
+ 298, 300, 302, 304, 305, 309, 313, 314, 317, 320,
+ 322, 324, 326, 328, 330, 332, 334, 336, 338, 340,
+ 342, 347, 350, 353, 355, 358, 360, 363, 365, 368,
+ 373, 378, 380, 381, 385, 387, 389, 392, 394, 397,
+ 399, 401, 405, 412, 413, 415, 418, 423, 425, 429,
+ 431, 433, 435, 437, 439, 441, 443, 445, 447, 449,
+ 452, 455, 458, 461, 464, 467, 470, 473, 476, 479,
+ 482, 485, 489, 491, 493, 495, 501, 503, 505, 507,
+ 510, 512, 514, 517, 519, 522, 529, 531, 535, 537,
+ 539, 541, 543, 545, 550, 552, 554, 556, 558, 560,
+ 562, 565, 567, 569, 575, 577, 580, 582, 584, 590,
+ 593, 594, 601, 605, 606, 608, 610, 612, 614, 616,
+ 619, 621, 623, 626, 631, 636, 637, 641, 643, 645,
+ 647, 650, 652, 654, 656, 658, 664, 666, 670, 676,
+ 682, 684, 688, 694, 696, 698, 700, 702, 704, 706,
+ 708, 710, 712, 716, 722, 730, 740, 743, 746, 748,
+ 750, 751, 752, 757, 759, 760, 761, 765, 769, 771,
+ 777, 780, 783, 786, 789, 793, 796, 802, 806, 807,
+ 809, 811, 812, 814, 816, 817, 819, 821, 822, 824,
+ 826, 827, 831, 832, 836, 837, 841, 843, 845, 847,
+ 852, 854
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yytype_int16 yyrhs[] =
{
- 121, 0, -1, 122, 123, 125, 12, -1, 3, -1,
- 4, -1, 123, 124, -1, -1, 8, 262, 108, -1,
- 125, 126, -1, -1, 127, 108, -1, 170, 108, -1,
- 128, -1, 129, -1, 130, -1, 131, -1, 132, -1,
- 133, -1, 134, -1, 135, -1, 141, -1, 136, -1,
- 137, -1, 138, -1, 19, 146, 109, 142, -1, 18,
- 145, 109, 144, -1, 16, 145, 109, 142, -1, 14,
- 145, 109, 142, 109, 142, -1, 13, 145, 109, 144,
- 109, 144, -1, 17, 145, 109, 144, 109, 144, 109,
- 144, -1, 15, 145, 109, 144, 109, 139, 109, 140,
- -1, 20, 144, -1, 20, 166, -1, 22, 145, 109,
- 144, 109, 144, 109, 144, 109, 139, 109, 140, -1,
- 83, 256, -1, 84, -1, 85, -1, 86, -1, 87,
- -1, 88, -1, 89, -1, 90, -1, 91, -1, 92,
- -1, 93, -1, 94, -1, 95, -1, 21, 145, 109,
- 150, 109, 147, -1, 241, 143, -1, 241, 110, 143,
- 110, -1, 150, 162, -1, 238, -1, 241, 150, 163,
- -1, 241, 110, 150, 163, 110, -1, 151, 164, 165,
- -1, 159, 161, -1, 148, 109, 148, 109, 148, 109,
- 148, -1, 241, 149, -1, 23, -1, 262, -1, 100,
- -1, 172, -1, 152, 111, 153, 112, -1, 186, -1,
- 249, -1, 100, -1, 100, -1, 154, -1, 155, -1,
- 23, -1, 159, 160, 156, -1, -1, 113, 157, -1,
- 114, 158, -1, 23, -1, 23, -1, 100, -1, 104,
- -1, 104, -1, 104, -1, 104, -1, 101, -1, 105,
- -1, -1, 101, -1, 102, -1, 103, -1, 104, -1,
- -1, 115, 166, 116, -1, 115, 167, 116, -1, -1,
- 168, 163, -1, 169, 163, -1, 99, -1, 100, -1,
- 171, -1, 178, -1, 242, -1, 245, -1, 248, -1,
- 261, -1, 7, 99, 117, 172, -1, 96, 173, -1,
- 38, 177, -1, 60, -1, 98, 175, -1, 53, -1,
- 29, 254, -1, 37, -1, 74, 255, -1, 50, 111,
- 176, 112, -1, 97, 111, 174, 112, -1, 23, -1,
- -1, 111, 176, 112, -1, 23, -1, 60, -1, 29,
- 254, -1, 37, -1, 74, 255, -1, 179, -1, 180,
- -1, 10, 99, 182, -1, 10, 99, 111, 181, 112,
- 183, -1, -1, 23, -1, 117, 185, -1, 117, 118,
- 184, 119, -1, 187, -1, 184, 109, 187, -1, 189,
- -1, 225, -1, 235, -1, 189, -1, 225, -1, 236,
- -1, 188, -1, 226, -1, 235, -1, 189, -1, 73,
- 213, -1, 73, 190, -1, 73, 192, -1, 73, 195,
- -1, 73, 197, -1, 73, 203, -1, 73, 199, -1,
- 73, 206, -1, 73, 208, -1, 73, 210, -1, 73,
- 212, -1, 73, 224, -1, 47, 253, 191, -1, 201,
- -1, 33, -1, 69, -1, 43, 111, 202, 112, 193,
- -1, 201, -1, 60, -1, 26, -1, 72, 194, -1,
- 40, -1, 32, -1, 44, 196, -1, 25, -1, 253,
- 67, -1, 45, 111, 202, 112, 253, 198, -1, 201,
- -1, 75, 257, 200, -1, 29, -1, 25, -1, 31,
- -1, 71, -1, 23, -1, 76, 255, 204, 205, -1,
- 35, -1, 54, -1, 79, -1, 80, -1, 78, -1,
- 77, -1, 36, 207, -1, 29, -1, 56, -1, 28,
- 111, 209, 112, 57, -1, 23, -1, 58, 211, -1,
- 70, -1, 26, -1, 215, 66, 111, 218, 112, -1,
- 215, 214, -1, -1, 66, 111, 218, 106, 218, 112,
- -1, 49, 219, 216, -1, -1, 217, -1, 41, -1,
- 82, -1, 42, -1, 23, -1, 51, 220, -1, 63,
- -1, 52, -1, 81, 255, -1, 55, 111, 222, 112,
- -1, 48, 111, 223, 112, -1, -1, 111, 221, 112,
- -1, 23, -1, 23, -1, 23, -1, 30, 64, -1,
- 229, -1, 232, -1, 227, -1, 230, -1, 62, 34,
- 111, 228, 112, -1, 233, -1, 233, 106, 233, -1,
- 62, 34, 111, 233, 112, -1, 62, 46, 111, 231,
- 112, -1, 234, -1, 234, 106, 234, -1, 62, 46,
- 111, 234, 112, -1, 23, -1, 23, -1, 237, -1,
- 239, -1, 238, -1, 239, -1, 240, -1, 24, -1,
- 23, -1, 118, 240, 119, -1, 118, 240, 109, 240,
- 119, -1, 118, 240, 109, 240, 109, 240, 119, -1,
- 118, 240, 109, 240, 109, 240, 109, 240, 119, -1,
- 241, 24, -1, 241, 23, -1, 113, -1, 114, -1,
- -1, -1, 244, 11, 243, 247, -1, 262, -1, -1,
- -1, 5, 246, 247, -1, 247, 109, 99, -1, 99,
- -1, 244, 9, 99, 117, 249, -1, 65, 60, -1,
- 65, 37, -1, 65, 250, -1, 65, 59, -1, 65,
- 74, 255, -1, 65, 30, -1, 29, 251, 252, -1,
- -1, 39, -1, 27, -1, -1, 61, -1, 68, -1,
- -1, 39, -1, 27, -1, -1, 61, -1, 68, -1,
- -1, 111, 258, 112, -1, -1, 111, 259, 112, -1,
- -1, 111, 260, 112, -1, 23, -1, 23, -1, 23,
- -1, 6, 99, 117, 100, -1, 99, -1, 100, -1
+ 128, 0, -1, 129, 130, 132, 12, -1, 3, -1,
+ 4, -1, 130, 131, -1, -1, 8, 277, 114, -1,
+ 132, 133, -1, -1, 134, 114, -1, 185, 114, -1,
+ 183, 115, -1, 135, -1, 136, -1, 137, -1, 139,
+ -1, 138, -1, 140, -1, 141, -1, 142, -1, 143,
+ -1, 144, -1, 145, -1, 151, -1, 146, -1, 147,
+ -1, 148, -1, 152, -1, 153, -1, 24, 158, 116,
+ 154, -1, 25, 158, 116, 156, -1, 26, 158, 116,
+ 159, -1, 27, 159, -1, 28, 158, -1, 18, 157,
+ 116, 156, -1, 16, 157, 116, 154, -1, 14, 157,
+ 116, 154, 116, 154, -1, 13, 157, 116, 156, 116,
+ 156, -1, 17, 157, 116, 156, 116, 156, 116, 156,
+ -1, 15, 157, 116, 156, 116, 149, 116, 150, -1,
+ 19, 156, -1, 19, 179, -1, 21, 157, 116, 156,
+ 116, 156, 116, 156, 116, 149, 116, 150, -1, 89,
+ 271, -1, 277, 271, -1, 90, -1, 91, -1, 92,
+ -1, 93, -1, 94, -1, 95, -1, 96, -1, 97,
+ -1, 98, -1, 99, -1, 100, -1, 101, -1, 277,
+ -1, 20, 157, 116, 164, 116, 161, -1, 22, 184,
+ 178, -1, 23, 178, -1, 256, 155, -1, 256, 117,
+ 155, 117, -1, 164, 175, -1, 253, -1, 256, 164,
+ 176, -1, 256, 117, 164, 176, 117, -1, 165, 177,
+ 178, -1, 173, 177, 178, -1, 160, -1, 173, -1,
+ 162, 116, 162, 116, 162, 116, 162, -1, 256, 163,
+ -1, 29, -1, 277, -1, 106, -1, 187, -1, 166,
+ 118, 167, 119, -1, 201, -1, 264, -1, 106, -1,
+ 106, -1, 168, -1, 169, -1, 29, -1, 173, 174,
+ 170, -1, -1, 120, 171, -1, 121, 172, -1, 29,
+ -1, 29, -1, 106, -1, 110, -1, 110, -1, 110,
+ -1, 107, -1, 111, -1, -1, 107, -1, 108, -1,
+ 109, -1, 110, -1, -1, 122, 179, 123, -1, 122,
+ 180, 123, -1, -1, 181, 176, -1, 182, 176, -1,
+ 105, -1, 106, -1, 184, -1, 105, -1, 106, -1,
+ 186, -1, 193, -1, 257, -1, 260, -1, 263, -1,
+ 276, -1, 7, 105, 124, 187, -1, 102, 188, -1,
+ 44, 192, -1, 66, -1, 104, 190, -1, 59, -1,
+ 35, 269, -1, 43, -1, 80, 270, -1, 56, 118,
+ 191, 119, -1, 103, 118, 189, 119, -1, 29, -1,
+ -1, 118, 191, 119, -1, 29, -1, 66, -1, 35,
+ 269, -1, 43, -1, 80, 270, -1, 194, -1, 195,
+ -1, 10, 105, 197, -1, 10, 105, 118, 196, 119,
+ 198, -1, -1, 29, -1, 124, 200, -1, 124, 125,
+ 199, 126, -1, 202, -1, 199, 116, 202, -1, 204,
+ -1, 240, -1, 250, -1, 204, -1, 240, -1, 251,
+ -1, 203, -1, 241, -1, 250, -1, 204, -1, 79,
+ 228, -1, 79, 205, -1, 79, 207, -1, 79, 210,
+ -1, 79, 212, -1, 79, 218, -1, 79, 214, -1,
+ 79, 221, -1, 79, 223, -1, 79, 225, -1, 79,
+ 227, -1, 79, 239, -1, 53, 268, 206, -1, 216,
+ -1, 39, -1, 75, -1, 49, 118, 217, 119, 208,
+ -1, 216, -1, 66, -1, 32, -1, 78, 209, -1,
+ 46, -1, 38, -1, 50, 211, -1, 31, -1, 268,
+ 73, -1, 51, 118, 217, 119, 268, 213, -1, 216,
+ -1, 81, 272, 215, -1, 35, -1, 31, -1, 37,
+ -1, 77, -1, 29, -1, 82, 270, 219, 220, -1,
+ 41, -1, 60, -1, 85, -1, 86, -1, 84, -1,
+ 83, -1, 42, 222, -1, 35, -1, 62, -1, 34,
+ 118, 224, 119, 63, -1, 29, -1, 64, 226, -1,
+ 76, -1, 32, -1, 230, 72, 118, 233, 119, -1,
+ 230, 229, -1, -1, 72, 118, 233, 112, 233, 119,
+ -1, 55, 234, 231, -1, -1, 232, -1, 47, -1,
+ 88, -1, 48, -1, 29, -1, 57, 235, -1, 69,
+ -1, 58, -1, 87, 270, -1, 61, 118, 237, 119,
+ -1, 54, 118, 238, 119, -1, -1, 118, 236, 119,
+ -1, 29, -1, 29, -1, 29, -1, 36, 70, -1,
+ 244, -1, 247, -1, 242, -1, 245, -1, 68, 40,
+ 118, 243, 119, -1, 248, -1, 248, 112, 248, -1,
+ 68, 40, 118, 248, 119, -1, 68, 52, 118, 246,
+ 119, -1, 249, -1, 249, 112, 249, -1, 68, 52,
+ 118, 249, 119, -1, 29, -1, 29, -1, 252, -1,
+ 254, -1, 253, -1, 254, -1, 255, -1, 30, -1,
+ 29, -1, 125, 255, 126, -1, 125, 255, 116, 255,
+ 126, -1, 125, 255, 116, 255, 116, 255, 126, -1,
+ 125, 255, 116, 255, 116, 255, 116, 255, 126, -1,
+ 256, 30, -1, 256, 29, -1, 120, -1, 121, -1,
+ -1, -1, 259, 11, 258, 262, -1, 277, -1, -1,
+ -1, 5, 261, 262, -1, 262, 116, 105, -1, 105,
+ -1, 259, 9, 105, 124, 264, -1, 71, 66, -1,
+ 71, 43, -1, 71, 265, -1, 71, 65, -1, 71,
+ 80, 270, -1, 71, 36, -1, 71, 34, 118, 224,
+ 119, -1, 35, 266, 267, -1, -1, 45, -1, 33,
+ -1, -1, 67, -1, 74, -1, -1, 45, -1, 33,
+ -1, -1, 67, -1, 74, -1, -1, 118, 273, 119,
+ -1, -1, 118, 274, 119, -1, -1, 118, 275, 119,
+ -1, 29, -1, 29, -1, 29, -1, 6, 105, 124,
+ 106, -1, 105, -1, 106, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 268, 268, 271, 279, 291, 292, 295, 317, 318,
- 321, 336, 339, 344, 351, 352, 353, 354, 355, 356,
- 357, 360, 361, 362, 365, 371, 377, 383, 390, 396,
- 403, 447, 452, 462, 506, 512, 513, 514, 515, 516,
- 517, 518, 519, 520, 521, 522, 523, 526, 538, 546,
- 563, 570, 589, 600, 620, 645, 654, 687, 694, 709,
- 759, 801, 812, 833, 843, 849, 880, 897, 897, 899,
- 906, 918, 919, 920, 923, 937, 951, 969, 980, 992,
- 994, 995, 996, 997, 1000, 1000, 1000, 1000, 1001, 1004,
- 1008, 1013, 1020, 1027, 1034, 1057, 1080, 1081, 1082, 1083,
- 1084, 1085, 1088, 1106, 1110, 1116, 1120, 1124, 1128, 1137,
- 1146, 1150, 1155, 1161, 1172, 1172, 1173, 1175, 1179, 1183,
- 1187, 1193, 1193, 1195, 1211, 1234, 1237, 1248, 1254, 1260,
- 1261, 1268, 1274, 1280, 1288, 1294, 1300, 1308, 1314, 1320,
- 1328, 1329, 1332, 1333, 1334, 1335, 1336, 1337, 1338, 1339,
- 1340, 1341, 1342, 1345, 1354, 1358, 1362, 1368, 1377, 1381,
- 1385, 1394, 1398, 1404, 1410, 1417, 1422, 1430, 1440, 1442,
- 1450, 1456, 1460, 1464, 1470, 1481, 1490, 1494, 1499, 1503,
- 1507, 1511, 1517, 1524, 1528, 1534, 1542, 1553, 1560, 1564,
- 1570, 1580, 1591, 1595, 1613, 1622, 1625, 1631, 1635, 1639,
- 1645, 1656, 1661, 1666, 1671, 1676, 1681, 1689, 1692, 1697,
- 1710, 1718, 1729, 1737, 1737, 1739, 1739, 1741, 1751, 1756,
- 1763, 1773, 1782, 1787, 1794, 1804, 1814, 1826, 1826, 1827,
- 1827, 1829, 1839, 1847, 1857, 1865, 1873, 1882, 1893, 1897,
- 1903, 1904, 1905, 1908, 1908, 1911, 1946, 1950, 1950, 1953,
- 1959, 1967, 1980, 1989, 1998, 2002, 2011, 2020, 2031, 2038,
- 2043, 2052, 2064, 2067, 2076, 2087, 2088, 2089, 2092, 2093,
- 2094, 2097, 2098, 2101, 2102, 2105, 2106, 2109, 2120, 2131,
- 2142, 2163, 2164
+ 0, 276, 276, 279, 287, 299, 300, 303, 325, 326,
+ 329, 344, 345, 348, 353, 358, 361, 362, 363, 364,
+ 365, 366, 367, 368, 369, 372, 373, 374, 377, 378,
+ 387, 391, 397, 403, 407, 419, 425, 431, 438, 444,
+ 451, 495, 500, 510, 554, 558, 575, 576, 577, 578,
+ 579, 580, 581, 582, 583, 584, 585, 586, 587, 627,
+ 639, 656, 666, 674, 691, 698, 717, 728, 748, 773,
+ 795, 798, 807, 840, 847, 862, 912, 954, 965, 988,
+ 998, 1004, 1035, 1052, 1052, 1054, 1061, 1071, 1072, 1073,
+ 1076, 1090, 1104, 1122, 1143, 1145, 1146, 1147, 1148, 1151,
+ 1151, 1151, 1151, 1152, 1155, 1166, 1178, 1185, 1192, 1199,
+ 1220, 1241, 1260, 1260, 1263, 1264, 1265, 1266, 1267, 1268,
+ 1271, 1289, 1293, 1299, 1303, 1307, 1311, 1320, 1329, 1333,
+ 1338, 1344, 1355, 1355, 1356, 1358, 1362, 1366, 1370, 1376,
+ 1376, 1378, 1394, 1417, 1420, 1431, 1437, 1443, 1444, 1451,
+ 1457, 1463, 1471, 1477, 1483, 1491, 1497, 1503, 1511, 1512,
+ 1515, 1516, 1517, 1518, 1519, 1520, 1521, 1522, 1523, 1524,
+ 1525, 1528, 1537, 1541, 1545, 1551, 1560, 1564, 1568, 1577,
+ 1581, 1587, 1593, 1600, 1605, 1613, 1623, 1625, 1633, 1639,
+ 1643, 1647, 1653, 1664, 1673, 1677, 1682, 1686, 1690, 1694,
+ 1700, 1707, 1711, 1717, 1725, 1736, 1743, 1747, 1753, 1763,
+ 1774, 1778, 1796, 1805, 1808, 1814, 1818, 1822, 1828, 1839,
+ 1844, 1849, 1854, 1859, 1864, 1872, 1875, 1880, 1893, 1901,
+ 1912, 1920, 1920, 1922, 1922, 1924, 1934, 1939, 1946, 1956,
+ 1965, 1970, 1977, 1987, 1997, 2009, 2009, 2010, 2010, 2012,
+ 2022, 2030, 2040, 2048, 2056, 2065, 2076, 2080, 2086, 2087,
+ 2088, 2091, 2091, 2094, 2129, 2133, 2133, 2136, 2142, 2150,
+ 2163, 2172, 2181, 2185, 2194, 2203, 2212, 2219, 2226, 2231,
+ 2240, 2252, 2255, 2264, 2275, 2276, 2277, 2280, 2281, 2282,
+ 2285, 2286, 2289, 2290, 2293, 2294, 2297, 2308, 2319, 2330,
+ 2351, 2352
};
#endif
@@ -821,8 +842,9 @@ static const char *const yytname[] =
{
"$end", "error", "$undefined", "ARBvp_10", "ARBfp_10", "ADDRESS",
"ALIAS", "ATTRIB", "OPTION", "OUTPUT", "PARAM", "TEMP", "END", "BIN_OP",
- "BINSC_OP", "SAMPLE_OP", "SCALAR_OP", "TRI_OP", "VECTOR_OP", "ARL",
- "KIL", "SWZ", "TXD_OP", "INTEGER", "REAL", "AMBIENT", "ATTENUATION",
+ "BINSC_OP", "SAMPLE_OP", "SCALAR_OP", "TRI_OP", "VECTOR_OP", "KIL",
+ "SWZ", "TXD_OP", "BRA_OP", "FLOW_OP", "ARL_OP", "ARL_NV_OP", "ARA_OP",
+ "PUSHA_OP", "POPA_OP", "INTEGER", "REAL", "AMBIENT", "ATTENUATION",
"BACK", "CLIP", "COLOR", "DEPTH", "DIFFUSE", "DIRECTION", "EMISSION",
"ENV", "EYE", "FOG", "FOGCOORD", "FRAGMENT", "FRONT", "HALF", "INVERSE",
"INVTRANS", "LIGHT", "LIGHTMODEL", "LIGHTPROD", "LOCAL", "MATERIAL",
@@ -836,20 +858,23 @@ static const char *const yytname[] =
"TEX_SHADOW2D", "TEX_SHADOWRECT", "TEX_ARRAY1D", "TEX_ARRAY2D",
"TEX_ARRAYSHADOW1D", "TEX_ARRAYSHADOW2D", "VERTEX", "VTXATTRIB",
"WEIGHT", "IDENTIFIER", "USED_IDENTIFIER", "MASK4", "MASK3", "MASK2",
- "MASK1", "SWIZZLE", "DOT_DOT", "DOT", "';'", "','", "'|'", "'['", "']'",
- "'+'", "'-'", "'('", "')'", "'='", "'{'", "'}'", "$accept", "program",
- "language", "optionSequence", "option", "statementSequence", "statement",
- "instruction", "ALU_instruction", "TexInstruction", "ARL_instruction",
- "VECTORop_instruction", "SCALARop_instruction", "BINSCop_instruction",
- "BINop_instruction", "TRIop_instruction", "SAMPLE_instruction",
- "KIL_instruction", "TXD_instruction", "texImageUnit", "texTarget",
- "SWZ_instruction", "scalarSrcReg", "scalarUse", "swizzleSrcReg",
- "maskedDstReg", "maskedAddrReg", "extendedSwizzle", "extSwizComp",
- "extSwizSel", "srcReg", "dstReg", "progParamArray", "progParamArrayMem",
- "progParamArrayAbs", "progParamArrayRel", "addrRegRelOffset",
- "addrRegPosOffset", "addrRegNegOffset", "addrReg", "addrComponent",
- "addrWriteMask", "scalarSuffix", "swizzleSuffix", "optionalMask",
- "optionalCcMask", "ccTest", "ccTest2", "ccMaskRule", "ccMaskRule2",
+ "MASK1", "SWIZZLE", "DOT_DOT", "DOT", "';'", "':'", "','", "'|'", "'['",
+ "']'", "'+'", "'-'", "'('", "')'", "'='", "'{'", "'}'", "$accept",
+ "program", "language", "optionSequence", "option", "statementSequence",
+ "statement", "instruction", "ALU_instruction", "TexInstruction",
+ "FlowInstruction", "ARL_instruction", "ARA_instruction",
+ "ASTACK_instruction", "VECTORop_instruction", "SCALARop_instruction",
+ "BINSCop_instruction", "BINop_instruction", "TRIop_instruction",
+ "SAMPLE_instruction", "KIL_instruction", "TXD_instruction",
+ "texImageUnit", "texTarget", "SWZ_instruction", "BRA_instruction",
+ "FLOWCC_instruction", "scalarSrcReg", "scalarUse", "swizzleSrcReg",
+ "maskedDstReg", "instResultAddr", "instOperandAddrVNS", "addrUseVNS",
+ "extendedSwizzle", "extSwizComp", "extSwizSel", "srcReg", "dstReg",
+ "progParamArray", "progParamArrayMem", "progParamArrayAbs",
+ "progParamArrayRel", "addrRegRelOffset", "addrRegPosOffset",
+ "addrRegNegOffset", "addrReg", "addrComponent", "scalarSuffix",
+ "swizzleSuffix", "optionalMask", "optionalCcMask", "ccTest", "ccTest2",
+ "ccMaskRule", "ccMaskRule2", "labelStatement", "labelName",
"namingStatement", "ATTRIB_statement", "attribBinding", "vtxAttribItem",
"vtxAttribNum", "vtxOptWeightNum", "vtxWeightNum", "fragAttribItem",
"PARAM_statement", "PARAM_singleStmt", "PARAM_multipleStmt",
@@ -898,77 +923,82 @@ static const yytype_uint16 yytoknum[] =
325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
345, 346, 347, 348, 349, 350, 351, 352, 353, 354,
- 355, 356, 357, 358, 359, 360, 361, 362, 59, 44,
- 124, 91, 93, 43, 45, 40, 41, 61, 123, 125
+ 355, 356, 357, 358, 359, 360, 361, 362, 363, 364,
+ 365, 366, 367, 368, 59, 58, 44, 124, 91, 93,
+ 43, 45, 40, 41, 61, 123, 125
};
# endif
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_uint16 yyr1[] =
{
- 0, 120, 121, 122, 122, 123, 123, 124, 125, 125,
- 126, 126, 127, 127, 128, 128, 128, 128, 128, 128,
- 128, 129, 129, 129, 130, 131, 132, 133, 134, 135,
- 136, 137, 137, 138, 139, 140, 140, 140, 140, 140,
- 140, 140, 140, 140, 140, 140, 140, 141, 142, 142,
- 143, 143, 144, 144, 145, 146, 147, 148, 149, 149,
- 150, 150, 150, 150, 151, 151, 152, 153, 153, 154,
- 155, 156, 156, 156, 157, 158, 159, 160, 161, 162,
- 163, 163, 163, 163, 164, 164, 164, 164, 164, 165,
- 165, 165, 166, 167, 168, 169, 170, 170, 170, 170,
- 170, 170, 171, 172, 172, 173, 173, 173, 173, 173,
- 173, 173, 173, 174, 175, 175, 176, 177, 177, 177,
- 177, 178, 178, 179, 180, 181, 181, 182, 183, 184,
- 184, 185, 185, 185, 186, 186, 186, 187, 187, 187,
- 188, 188, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 190, 191, 191, 191, 192, 193, 193,
- 193, 193, 193, 194, 195, 196, 196, 197, 198, 199,
- 200, 201, 201, 201, 202, 203, 204, 204, 205, 205,
- 205, 205, 206, 207, 207, 208, 209, 210, 211, 211,
- 212, 213, 214, 214, 215, 216, 216, 217, 217, 217,
- 218, 219, 219, 219, 219, 219, 219, 220, 220, 221,
- 222, 223, 224, 225, 225, 226, 226, 227, 228, 228,
- 229, 230, 231, 231, 232, 233, 234, 235, 235, 236,
- 236, 237, 238, 238, 239, 239, 239, 239, 240, 240,
- 241, 241, 241, 243, 242, 244, 244, 246, 245, 247,
- 247, 248, 249, 249, 249, 249, 249, 249, 250, 251,
- 251, 251, 252, 252, 252, 253, 253, 253, 254, 254,
- 254, 255, 255, 256, 256, 257, 257, 258, 259, 260,
- 261, 262, 262
+ 0, 127, 128, 129, 129, 130, 130, 131, 132, 132,
+ 133, 133, 133, 134, 134, 134, 135, 135, 135, 135,
+ 135, 135, 135, 135, 135, 136, 136, 136, 137, 137,
+ 138, 138, 139, 140, 140, 141, 142, 143, 144, 145,
+ 146, 147, 147, 148, 149, 149, 150, 150, 150, 150,
+ 150, 150, 150, 150, 150, 150, 150, 150, 150, 151,
+ 152, 153, 154, 154, 155, 155, 156, 156, 157, 158,
+ 159, 160, 161, 162, 163, 163, 164, 164, 164, 164,
+ 165, 165, 166, 167, 167, 168, 169, 170, 170, 170,
+ 171, 172, 173, 174, 175, 176, 176, 176, 176, 177,
+ 177, 177, 177, 177, 178, 178, 178, 179, 180, 181,
+ 182, 183, 184, 184, 185, 185, 185, 185, 185, 185,
+ 186, 187, 187, 188, 188, 188, 188, 188, 188, 188,
+ 188, 189, 190, 190, 191, 192, 192, 192, 192, 193,
+ 193, 194, 195, 196, 196, 197, 198, 199, 199, 200,
+ 200, 200, 201, 201, 201, 202, 202, 202, 203, 203,
+ 204, 204, 204, 204, 204, 204, 204, 204, 204, 204,
+ 204, 205, 206, 206, 206, 207, 208, 208, 208, 208,
+ 208, 209, 210, 211, 211, 212, 213, 214, 215, 216,
+ 216, 216, 217, 218, 219, 219, 220, 220, 220, 220,
+ 221, 222, 222, 223, 224, 225, 226, 226, 227, 228,
+ 229, 229, 230, 231, 231, 232, 232, 232, 233, 234,
+ 234, 234, 234, 234, 234, 235, 235, 236, 237, 238,
+ 239, 240, 240, 241, 241, 242, 243, 243, 244, 245,
+ 246, 246, 247, 248, 249, 250, 250, 251, 251, 252,
+ 253, 253, 254, 254, 254, 254, 255, 255, 256, 256,
+ 256, 258, 257, 259, 259, 261, 260, 262, 262, 263,
+ 264, 264, 264, 264, 264, 264, 264, 265, 266, 266,
+ 266, 267, 267, 267, 268, 268, 268, 269, 269, 269,
+ 270, 270, 271, 271, 272, 272, 273, 274, 275, 276,
+ 277, 277
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
static const yytype_uint8 yyr2[] =
{
0, 2, 4, 1, 1, 2, 0, 3, 2, 0,
- 2, 2, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 4, 4, 4, 6, 6, 8,
- 8, 2, 2, 12, 2, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 6, 2, 4,
- 2, 1, 3, 5, 3, 2, 7, 2, 1, 1,
- 1, 1, 4, 1, 1, 1, 1, 1, 1, 1,
- 3, 0, 2, 2, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 0, 1, 1, 1, 1, 0, 3,
- 3, 0, 2, 2, 1, 1, 1, 1, 1, 1,
- 1, 1, 4, 2, 2, 1, 2, 1, 2, 1,
- 2, 4, 4, 1, 0, 3, 1, 1, 2, 1,
- 2, 1, 1, 3, 6, 0, 1, 2, 4, 1,
- 3, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 3, 1, 1, 1, 5, 1, 1,
- 1, 2, 1, 1, 2, 1, 2, 6, 1, 3,
- 1, 1, 1, 1, 1, 4, 1, 1, 1, 1,
- 1, 1, 2, 1, 1, 5, 1, 2, 1, 1,
- 5, 2, 0, 6, 3, 0, 1, 1, 1, 1,
- 1, 2, 1, 1, 2, 4, 4, 0, 3, 1,
- 1, 1, 2, 1, 1, 1, 1, 5, 1, 3,
- 5, 5, 1, 3, 5, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 3, 5, 7, 9, 2, 2,
- 1, 1, 0, 0, 4, 1, 0, 0, 3, 3,
- 1, 5, 2, 2, 2, 2, 3, 2, 3, 0,
- 1, 1, 0, 1, 1, 0, 1, 1, 0, 1,
- 1, 0, 3, 0, 3, 0, 3, 1, 1, 1,
- 4, 1, 1
+ 2, 2, 2, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 4, 4, 4, 2, 2, 4, 4, 6, 6, 8,
+ 8, 2, 2, 12, 2, 2, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 6,
+ 3, 2, 2, 4, 2, 1, 3, 5, 3, 3,
+ 1, 1, 7, 2, 1, 1, 1, 1, 4, 1,
+ 1, 1, 1, 1, 1, 1, 3, 0, 2, 2,
+ 1, 1, 1, 1, 1, 1, 1, 1, 0, 1,
+ 1, 1, 1, 0, 3, 3, 0, 2, 2, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 4, 2, 2, 1, 2, 1, 2, 1, 2, 4,
+ 4, 1, 0, 3, 1, 1, 2, 1, 2, 1,
+ 1, 3, 6, 0, 1, 2, 4, 1, 3, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 3, 1, 1, 1, 5, 1, 1, 1, 2,
+ 1, 1, 2, 1, 2, 6, 1, 3, 1, 1,
+ 1, 1, 1, 4, 1, 1, 1, 1, 1, 1,
+ 2, 1, 1, 5, 1, 2, 1, 1, 5, 2,
+ 0, 6, 3, 0, 1, 1, 1, 1, 1, 2,
+ 1, 1, 2, 4, 4, 0, 3, 1, 1, 1,
+ 2, 1, 1, 1, 1, 5, 1, 3, 5, 5,
+ 1, 3, 5, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 3, 5, 7, 9, 2, 2, 1, 1,
+ 0, 0, 4, 1, 0, 0, 3, 3, 1, 5,
+ 2, 2, 2, 2, 3, 2, 5, 3, 0, 1,
+ 1, 0, 1, 1, 0, 1, 1, 0, 1, 1,
+ 0, 3, 0, 3, 0, 3, 1, 1, 1, 4,
+ 1, 1
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -976,296 +1006,330 @@ static const yytype_uint8 yyr2[] =
means the default is an error. */
static const yytype_uint16 yydefact[] =
{
- 0, 3, 4, 0, 6, 1, 9, 0, 5, 246,
- 281, 282, 0, 247, 0, 0, 0, 2, 0, 0,
- 0, 0, 0, 0, 0, 242, 0, 0, 8, 0,
- 12, 13, 14, 15, 16, 17, 18, 19, 21, 22,
- 23, 20, 0, 96, 97, 121, 122, 98, 0, 99,
- 100, 101, 245, 7, 0, 0, 0, 0, 0, 65,
- 0, 88, 64, 0, 0, 0, 0, 0, 76, 0,
- 0, 94, 240, 241, 31, 32, 83, 0, 0, 0,
- 10, 11, 0, 243, 250, 248, 0, 0, 125, 242,
- 123, 259, 257, 253, 255, 252, 271, 254, 242, 84,
- 85, 86, 87, 91, 242, 242, 242, 242, 242, 242,
- 78, 55, 81, 80, 82, 92, 233, 232, 0, 0,
- 0, 0, 60, 0, 242, 83, 0, 61, 63, 134,
- 135, 213, 214, 136, 229, 230, 0, 242, 0, 0,
- 0, 280, 102, 126, 0, 127, 131, 132, 133, 227,
- 228, 231, 0, 261, 260, 262, 0, 256, 0, 0,
- 54, 0, 0, 0, 26, 0, 25, 24, 268, 119,
- 117, 271, 104, 0, 0, 0, 0, 0, 0, 265,
- 0, 265, 0, 0, 275, 271, 142, 143, 144, 145,
- 147, 146, 148, 149, 150, 151, 0, 152, 268, 109,
- 0, 107, 105, 271, 0, 114, 103, 83, 0, 52,
- 0, 0, 0, 0, 244, 249, 0, 239, 238, 263,
- 264, 258, 277, 0, 242, 95, 0, 0, 83, 242,
- 0, 48, 0, 51, 0, 242, 269, 270, 118, 120,
- 0, 0, 0, 212, 183, 184, 182, 0, 165, 267,
- 266, 164, 0, 0, 0, 0, 207, 203, 0, 202,
- 271, 195, 189, 188, 187, 0, 0, 0, 0, 108,
- 0, 110, 0, 0, 106, 0, 242, 234, 69, 0,
- 67, 68, 0, 242, 242, 251, 0, 124, 272, 28,
- 89, 90, 93, 27, 0, 79, 50, 273, 0, 0,
- 225, 0, 226, 0, 186, 0, 174, 0, 166, 0,
- 171, 172, 155, 156, 173, 153, 154, 0, 0, 201,
- 0, 204, 197, 199, 198, 194, 196, 279, 0, 170,
- 169, 176, 177, 0, 0, 116, 0, 113, 0, 0,
- 53, 0, 62, 77, 71, 47, 0, 0, 0, 242,
- 49, 0, 34, 0, 242, 220, 224, 0, 0, 265,
- 211, 0, 209, 0, 210, 0, 276, 181, 180, 178,
- 179, 175, 200, 0, 111, 112, 115, 242, 235, 0,
- 0, 70, 242, 58, 57, 59, 242, 0, 0, 0,
- 129, 137, 140, 138, 215, 216, 139, 278, 0, 35,
- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
- 46, 30, 29, 185, 160, 162, 159, 0, 157, 158,
- 0, 206, 208, 205, 190, 0, 74, 72, 75, 73,
- 0, 0, 0, 0, 141, 192, 242, 128, 274, 163,
- 161, 167, 168, 242, 236, 242, 0, 0, 0, 0,
- 191, 130, 0, 0, 0, 0, 218, 0, 222, 0,
- 237, 242, 0, 217, 0, 221, 0, 0, 56, 33,
- 219, 223, 0, 0, 193
+ 0, 3, 4, 0, 6, 1, 9, 0, 5, 264,
+ 300, 301, 0, 265, 0, 0, 0, 2, 0, 0,
+ 0, 0, 0, 0, 260, 0, 0, 0, 106, 0,
+ 0, 0, 0, 0, 300, 301, 8, 0, 13, 14,
+ 15, 17, 16, 18, 19, 20, 21, 22, 23, 25,
+ 26, 27, 24, 28, 29, 0, 111, 0, 114, 115,
+ 139, 140, 116, 0, 117, 118, 119, 263, 7, 0,
+ 0, 0, 0, 0, 81, 0, 103, 80, 0, 0,
+ 0, 0, 0, 109, 258, 259, 41, 42, 98, 0,
+ 0, 0, 112, 113, 106, 0, 61, 92, 0, 103,
+ 0, 0, 33, 70, 71, 34, 10, 12, 11, 0,
+ 261, 268, 266, 0, 0, 143, 260, 141, 0, 278,
+ 275, 271, 273, 270, 290, 272, 260, 99, 100, 101,
+ 102, 106, 260, 260, 260, 260, 260, 96, 95, 97,
+ 107, 251, 250, 0, 0, 0, 0, 76, 0, 260,
+ 98, 0, 77, 79, 152, 153, 231, 232, 154, 247,
+ 248, 0, 260, 60, 110, 0, 0, 98, 260, 106,
+ 260, 0, 0, 0, 0, 299, 120, 144, 0, 145,
+ 149, 150, 151, 245, 246, 249, 0, 0, 280, 279,
+ 281, 0, 274, 0, 68, 0, 0, 0, 36, 0,
+ 35, 287, 137, 135, 290, 122, 0, 0, 0, 0,
+ 0, 0, 284, 0, 284, 0, 0, 294, 290, 160,
+ 161, 162, 163, 165, 164, 166, 167, 168, 169, 0,
+ 170, 287, 127, 0, 125, 123, 290, 0, 132, 121,
+ 98, 0, 66, 0, 0, 0, 104, 105, 108, 30,
+ 69, 31, 32, 0, 262, 267, 0, 257, 256, 204,
+ 0, 282, 283, 277, 296, 0, 260, 260, 0, 62,
+ 0, 65, 0, 260, 288, 289, 136, 138, 0, 0,
+ 0, 230, 201, 202, 200, 0, 183, 286, 285, 182,
+ 0, 0, 0, 0, 225, 221, 0, 220, 290, 213,
+ 207, 206, 205, 0, 0, 0, 0, 126, 0, 128,
+ 0, 0, 124, 0, 260, 252, 85, 0, 83, 84,
+ 0, 260, 260, 269, 0, 142, 276, 291, 38, 37,
+ 0, 94, 64, 292, 0, 292, 0, 243, 0, 244,
+ 0, 0, 192, 0, 184, 0, 189, 190, 173, 174,
+ 191, 171, 172, 0, 0, 219, 0, 222, 215, 217,
+ 216, 212, 214, 298, 0, 188, 187, 194, 195, 0,
+ 0, 134, 0, 131, 0, 0, 67, 0, 78, 93,
+ 87, 59, 0, 0, 0, 260, 63, 0, 44, 0,
+ 45, 260, 238, 242, 0, 0, 284, 229, 0, 227,
+ 0, 228, 0, 295, 199, 198, 196, 197, 193, 218,
+ 0, 129, 130, 133, 260, 253, 0, 0, 86, 260,
+ 74, 73, 75, 260, 0, 0, 0, 147, 155, 158,
+ 156, 233, 234, 157, 297, 0, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, 56, 57, 40, 58,
+ 39, 203, 178, 180, 177, 0, 175, 176, 0, 224,
+ 226, 223, 208, 0, 90, 88, 91, 89, 0, 0,
+ 0, 0, 159, 210, 260, 146, 293, 181, 179, 185,
+ 186, 260, 254, 260, 0, 0, 0, 0, 209, 148,
+ 0, 0, 0, 0, 236, 0, 240, 0, 255, 260,
+ 0, 235, 0, 239, 0, 0, 72, 43, 237, 241,
+ 0, 0, 211
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 3, 4, 6, 8, 9, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 298,
- 411, 41, 161, 231, 74, 60, 69, 345, 346, 384,
- 232, 61, 126, 279, 280, 281, 381, 427, 429, 70,
- 344, 111, 296, 115, 103, 160, 75, 227, 76, 228,
- 42, 43, 127, 206, 338, 274, 336, 172, 44, 45,
- 46, 144, 90, 287, 389, 145, 128, 390, 391, 129,
- 186, 315, 187, 418, 440, 188, 251, 189, 441, 190,
- 330, 316, 307, 191, 333, 371, 192, 246, 193, 305,
- 194, 264, 195, 434, 450, 196, 325, 326, 373, 261,
- 319, 363, 365, 361, 197, 130, 393, 394, 455, 131,
- 395, 457, 132, 301, 303, 396, 133, 149, 134, 135,
- 151, 77, 47, 139, 48, 49, 54, 85, 50, 62,
- 97, 155, 221, 252, 238, 157, 352, 266, 223, 398,
- 328, 51, 12
+ -1, 3, 4, 6, 8, 9, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+ 50, 51, 334, 448, 52, 53, 54, 195, 269, 86,
+ 75, 98, 102, 103, 381, 382, 421, 270, 76, 151,
+ 317, 318, 319, 418, 465, 467, 99, 380, 332, 140,
+ 131, 96, 87, 166, 88, 167, 55, 56, 57, 58,
+ 152, 239, 374, 312, 372, 205, 59, 60, 61, 178,
+ 117, 325, 426, 179, 153, 427, 428, 154, 219, 351,
+ 220, 456, 478, 221, 289, 222, 479, 223, 366, 352,
+ 343, 224, 369, 408, 225, 284, 226, 260, 227, 302,
+ 228, 472, 488, 229, 361, 362, 410, 299, 355, 400,
+ 402, 398, 230, 155, 430, 431, 493, 156, 432, 495,
+ 157, 338, 340, 433, 158, 183, 159, 160, 185, 89,
+ 62, 173, 63, 64, 69, 112, 65, 77, 125, 190,
+ 263, 290, 276, 192, 388, 304, 265, 435, 364, 66,
+ 335
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -401
+#define YYPACT_NINF -468
static const yytype_int16 yypact[] =
{
- 193, -401, -401, 27, -401, -401, 62, 143, -401, 24,
- -401, -401, -30, -401, -18, 12, 83, -401, 15, 15,
- 15, 15, 15, 15, 67, 61, 15, 15, -401, 127,
- -401, -401, -401, -401, -401, -401, -401, -401, -401, -401,
- -401, -401, 144, -401, -401, -401, -401, -401, 204, -401,
- -401, -401, -401, -401, 155, 136, 138, 34, 140, -401,
- 147, 108, -401, 150, 156, 157, 158, 160, -401, 162,
- 159, -401, -401, -401, -401, -401, 102, -13, 163, 164,
- -401, -401, 165, -401, -401, 166, 170, 10, 235, 0,
- -401, 141, -401, -401, -401, -401, 167, -401, 131, -401,
- -401, -401, -401, 168, 131, 131, 131, 131, 131, 131,
- -401, -401, -401, -401, -401, -401, -401, -401, 104, 97,
- 114, 38, 169, 30, 131, 102, 171, -401, -401, -401,
- -401, -401, -401, -401, -401, -401, 30, 131, 172, 155,
- 175, -401, -401, -401, 173, -401, -401, -401, -401, -401,
- -401, -401, 223, -401, -401, 123, 253, -401, 177, 149,
- -401, 178, -10, 181, -401, 182, -401, -401, 134, -401,
- -401, 167, -401, 183, 184, 185, 213, 99, 186, 154,
- 187, 146, 153, 7, 188, 167, -401, -401, -401, -401,
- -401, -401, -401, -401, -401, -401, 215, -401, 134, -401,
- 190, -401, -401, 167, 191, 192, -401, 102, -48, -401,
- 1, 195, 196, 214, 166, -401, 189, -401, -401, -401,
- -401, -401, -401, 180, 131, -401, 194, 197, 102, 131,
- 30, -401, 203, 205, 201, 131, -401, -401, -401, -401,
- 285, 288, 289, -401, -401, -401, -401, 291, -401, -401,
- -401, -401, 248, 291, 33, 206, 207, -401, 208, -401,
- 167, 14, -401, -401, -401, 293, 292, 92, 209, -401,
- 299, -401, 301, 299, -401, 216, 131, -401, -401, 217,
- -401, -401, 221, 131, 131, -401, 212, -401, -401, -401,
- -401, -401, -401, -401, 218, -401, -401, 220, 224, 225,
- -401, 226, -401, 227, -401, 228, -401, 230, -401, 231,
- -401, -401, -401, -401, -401, -401, -401, 304, 309, -401,
- 312, -401, -401, -401, -401, -401, -401, -401, 232, -401,
- -401, -401, -401, 161, 313, -401, 233, -401, 234, 238,
- -401, 13, -401, -401, 137, -401, 242, -15, 243, 3,
- -401, 314, -401, 133, 131, -401, -401, 296, 94, 146,
- -401, 245, -401, 246, -401, 247, -401, -401, -401, -401,
- -401, -401, -401, 249, -401, -401, -401, 131, -401, 332,
- 337, -401, 131, -401, -401, -401, 131, 142, 114, 28,
- -401, -401, -401, -401, -401, -401, -401, -401, 250, -401,
- -401, -401, -401, -401, -401, -401, -401, -401, -401, -401,
- -401, -401, -401, -401, -401, -401, -401, 331, -401, -401,
- 68, -401, -401, -401, -401, 43, -401, -401, -401, -401,
- 255, 256, 257, 258, -401, 300, 3, -401, -401, -401,
- -401, -401, -401, 131, -401, 131, 201, 285, 288, 259,
- -401, -401, 252, 264, 265, 263, 261, 266, 270, 313,
- -401, 131, 133, -401, 285, -401, 288, 80, -401, -401,
- -401, -401, 313, 267, -401
+ 144, -468, -468, 32, -468, -468, 28, 125, -468, 51,
+ -468, -468, -74, -468, 7, 16, 80, -468, -51, -51,
+ -51, -51, -51, -51, 13, -51, -51, 132, 117, 94,
+ 94, 94, 94, 94, 87, 90, -468, 133, -468, -468,
+ -468, -468, -468, -468, -468, -468, -468, -468, -468, -468,
+ -468, -468, -468, -468, -468, 150, -468, 172, -468, -468,
+ -468, -468, -468, 97, -468, -468, -468, -468, -468, 182,
+ 165, 166, -14, 138, -468, 175, 126, -468, 176, 177,
+ 178, 179, 180, -468, -468, -468, -468, -468, 118, 18,
+ 181, 184, -468, -468, 117, 158, -468, -468, 185, 126,
+ 186, 187, -468, -468, -468, -468, -468, -468, -468, 183,
+ -468, -468, 189, 192, -9, 277, 59, -468, 190, 4,
+ -468, -468, -468, -468, 193, -468, 162, -468, -468, -468,
+ -468, 117, 162, 162, 162, 162, 162, -468, -468, -468,
+ -468, -468, -468, 147, 109, 159, 66, 195, 61, 162,
+ 118, 196, -468, -468, -468, -468, -468, -468, -468, -468,
+ -468, 61, 162, -468, -468, 194, 197, 118, 162, 117,
+ 162, 94, 198, 182, 202, -468, -468, -468, 199, -468,
+ -468, -468, -468, -468, -468, -468, 239, 280, -468, -468,
+ 120, 281, -468, 200, -468, 203, 58, 205, -468, 207,
+ -468, 148, -468, -468, 193, -468, 206, 208, 209, 245,
+ -2, 210, 83, 211, 78, 163, 6, 212, 193, -468,
+ -468, -468, -468, -468, -468, -468, -468, -468, -468, 253,
+ -468, 148, -468, 213, -468, -468, 193, 214, 215, -468,
+ 118, -87, -468, -17, 218, 219, -468, -468, -468, -468,
+ -468, -468, -468, 265, 189, -468, 216, -468, -468, -468,
+ 220, -468, -468, -468, -468, 222, 162, 162, 61, -468,
+ 227, 232, 53, 162, -468, -468, -468, -468, 314, 315,
+ 280, -468, -468, -468, -468, 316, -468, -468, -468, -468,
+ 273, 316, 76, 229, 230, -468, 231, -468, 193, -34,
+ -468, -468, -468, 321, 317, -10, 233, -468, 324, -468,
+ 325, 324, -468, 238, 162, -468, -468, 237, -468, -468,
+ 247, 162, 162, -468, 235, -468, -468, -468, -468, -468,
+ 241, -468, -468, 246, 249, 246, 251, -468, 244, -468,
+ 250, 252, -468, 254, -468, 255, -468, -468, -468, -468,
+ -468, -468, -468, 341, 343, -468, 346, -468, -468, -468,
+ -468, -468, -468, -468, 258, -468, -468, -468, -468, 191,
+ 349, -468, 260, -468, 261, 262, -468, 52, -468, -468,
+ 164, -468, 267, -11, 269, 71, -468, 357, -468, 161,
+ -468, 162, -468, -468, 326, 99, 78, -468, 268, -468,
+ 271, -468, 272, -468, -468, -468, -468, -468, -468, -468,
+ 274, -468, -468, -468, 162, -468, 359, 363, -468, 162,
+ -468, -468, -468, 162, 114, 159, 72, -468, -468, -468,
+ -468, -468, -468, -468, -468, 275, -468, -468, -468, -468,
+ -468, -468, -468, -468, -468, -468, -468, -468, -468, -468,
+ -468, -468, -468, -468, -468, 358, -468, -468, 15, -468,
+ -468, -468, -468, 81, -468, -468, -468, -468, 279, 282,
+ 283, 284, -468, 327, 71, -468, -468, -468, -468, -468,
+ -468, 162, -468, 162, 53, 314, 315, 285, -468, -468,
+ 278, 289, 290, 288, 296, 291, 297, 349, -468, 162,
+ 161, -468, 314, -468, 315, 107, -468, -468, -468, -468,
+ 349, 292, -468
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -401, -401, -401, -401, -401, -401, -401, -401, -401, -401,
- -401, -401, -401, -401, -401, -401, -401, -401, -401, -69,
- -82, -401, -100, 151, -86, 210, -401, -401, -366, -401,
- -54, -401, -401, -401, -401, -401, -401, -401, -401, 174,
- -401, -401, -401, -118, -401, -401, 229, -401, -401, -401,
- -401, -401, 295, -401, -401, -401, 110, -401, -401, -401,
- -401, -401, -401, -401, -401, -401, -401, -51, -401, -88,
- -401, -401, -401, -401, -401, -401, -401, -401, -401, -401,
- -401, -311, 139, -401, -401, -401, -401, -401, -401, -401,
- -401, -401, -401, -401, -401, -2, -401, -401, -400, -401,
- -401, -401, -401, -401, -401, 298, -401, -401, -401, -401,
- -401, -401, -401, -390, -295, 302, -401, -401, -136, -87,
- -120, -89, -401, -401, -401, -401, -401, 251, -401, 176,
- -401, -401, -401, -176, 198, -153, -401, -401, -401, -401,
- -401, -401, -6
+ -468, -468, -468, -468, -468, -468, -468, -468, -468, -468,
+ -468, -468, -468, -468, -468, -468, -468, -468, -468, -468,
+ -468, -468, -84, -103, -468, -468, -468, -126, 145, -111,
+ 223, 248, 243, -468, -468, -403, -468, -63, -468, -468,
+ -468, -468, -468, -468, -468, -468, -27, -468, -468, -140,
+ 313, -50, 320, -468, -468, -468, -468, 389, -468, -468,
+ 303, -468, -468, -468, 108, -468, -468, -468, -468, -468,
+ -468, -468, -468, -468, -468, -56, -468, -113, -468, -468,
+ -468, -468, -468, -468, -468, -468, -468, -468, -468, -374,
+ 129, -468, -468, -468, -468, -468, -468, 141, -468, -468,
+ -468, -468, -468, -3, -468, -468, -467, -468, -468, -468,
+ -468, -468, -468, 307, -468, -468, -468, -468, -468, -468,
+ -468, -457, -387, 308, -468, -468, -185, -112, -143, -115,
+ -468, -468, -468, -468, -468, 256, -468, 173, -468, -468,
+ -468, -207, 201, -195, 92, -468, -468, -468, -468, -468,
+ -7
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
positive, shift that token. If negative, reduce the rule which
number is the opposite. If zero, do what YYDEFACT says.
If YYTABLE_NINF, syntax error. */
-#define YYTABLE_NINF -230
+#define YYTABLE_NINF -248
static const yytype_int16 yytable[] =
{
- 152, 146, 150, 52, 208, 254, 164, 209, 383, 167,
- 116, 117, 158, 116, 117, 162, 430, 162, 239, 163,
- 162, 165, 166, 125, 278, 118, 233, 5, 118, 13,
- 14, 15, 267, 262, 16, 152, 17, 18, 19, 20,
- 21, 22, 23, 24, 25, 26, 27, 419, 118, 119,
- 271, 212, 119, 116, 117, 322, 323, 456, 310, 467,
- 120, 276, 119, 120, 311, 387, 312, 198, 118, 207,
- 7, 277, 473, 120, 470, 199, 388, 263, 53, 453,
- 58, 55, 211, 121, 10, 11, 121, 122, 200, 275,
- 122, 201, 119, 310, 233, 468, 324, 123, 202, 311,
- 230, 68, 313, 120, 314, 124, 121, 321, 124, 442,
- 292, 56, 203, 72, 73, 59, 72, 73, 124, 310,
- 414, 124, 377, 10, 11, 311, 121, 331, 244, 293,
- 122, 173, 378, 168, 415, 204, 205, 436, 289, 314,
- 162, 169, 175, 174, 176, 88, 332, 437, 124, 299,
- 177, 89, 443, 458, 416, 245, 341, 178, 179, 180,
- 71, 181, 444, 182, 170, 314, 417, 68, 153, 91,
- 92, 471, 183, 249, 72, 73, 432, 93, 171, 248,
- 154, 249, 57, 420, 219, 250, 472, 152, 433, 184,
- 185, 220, 424, 250, 347, 236, 1, 2, 348, 94,
- 95, 255, 237, 112, 256, 257, 113, 114, 258, 99,
- 100, 101, 102, 82, 96, 83, 259, 399, 400, 401,
- 402, 403, 404, 405, 406, 407, 408, 409, 410, 63,
- 64, 65, 66, 67, 260, 80, 78, 79, 367, 368,
- 369, 370, 10, 11, 72, 73, 217, 218, 71, 225,
- 379, 380, 81, 86, 84, 87, 98, 425, 143, 104,
- 152, 392, 150, 110, 138, 105, 106, 107, 412, 108,
- 141, 109, 136, 137, 215, 140, 222, 243, 156, 58,
- -66, 268, 210, 159, 297, 216, 224, 229, 152, 213,
- 234, 235, 288, 347, 240, 241, 242, 247, 253, 265,
- 431, 270, 272, 273, 283, 284, 286, 295, 300, -229,
- 290, 302, 304, 291, 306, 308, 327, 317, 318, 320,
- 334, 329, 335, 452, 337, 343, 340, 360, 350, 342,
- 349, 351, 362, 353, 354, 364, 372, 397, 355, 356,
- 357, 385, 358, 359, 366, 374, 375, 152, 392, 150,
- 376, 382, 386, 413, 152, 426, 347, 421, 422, 423,
- 428, 424, 438, 439, 445, 446, 449, 464, 447, 448,
- 459, 460, 347, 461, 462, 463, 466, 454, 465, 474,
- 469, 294, 142, 339, 282, 451, 435, 147, 226, 285,
- 214, 148, 309, 0, 0, 0, 269
+ 12, 186, 67, 180, 184, 104, 241, 292, 198, 277,
+ 242, 271, 316, 358, 359, 193, 468, 196, 420, 196,
+ 73, 457, 197, 305, 199, 200, 150, 248, 494, 314,
+ 505, 367, 5, 282, 186, 143, 7, 188, 300, 315,
+ 68, 309, 249, 511, 163, 508, 346, 141, 142, 189,
+ 368, 245, 347, 196, 360, 74, 13, 14, 15, 251,
+ 283, 16, 143, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ 491, 194, 301, 271, 480, 240, 144, 141, 142, 97,
+ 141, 142, 350, 146, 10, 11, 506, 145, 244, 496,
+ 313, 231, 143, 357, 115, 143, 109, 346, 110, 232,
+ 116, 287, 70, 347, 286, 348, 287, 509, 83, 250,
+ 146, 71, 233, 288, 147, 234, 144, 144, 288, 144,
+ 346, 452, 235, 84, 85, 148, 347, 145, 145, 424,
+ 145, 329, 333, 149, 104, 453, 236, 1, 2, 206,
+ 425, 349, 196, 350, 470, 328, 34, 35, 10, 11,
+ 146, 207, 336, 146, 147, 454, 471, 147, 414, 237,
+ 238, 377, 118, 119, 120, 268, 350, 455, 415, 84,
+ 85, 121, 201, 149, 149, 72, 149, 261, 474, 458,
+ 202, 84, 85, 208, 262, 209, 149, 481, 475, 186,
+ 97, 210, -112, 122, 123, -113, 383, 482, 211, 212,
+ 213, 384, 214, 203, 215, 274, 320, 293, 124, 510,
+ 294, 295, 275, 216, 296, 137, 462, 204, 138, 139,
+ 10, 11, 297, 127, 128, 129, 130, 92, 93, 95,
+ 217, 218, 78, 79, 80, 81, 82, 106, 90, 91,
+ 298, 436, 437, 438, 439, 440, 441, 442, 443, 444,
+ 445, 446, 447, 83, 164, 107, 10, 11, 257, 258,
+ 186, 463, 429, 184, 404, 405, 406, 407, 100, 101,
+ 450, 105, 84, 85, 416, 417, 108, 111, 172, 113,
+ 114, 126, 132, 133, 134, 135, 136, 161, 175, 186,
+ 162, 168, 170, 171, 383, 174, 177, 255, 187, 259,
+ 264, 191, 469, -82, 243, 281, 266, 246, 256, 267,
+ 247, 272, 253, 273, 278, 306, 279, 280, 285, 291,
+ 303, 308, 310, 311, 321, 322, 73, 331, 490, 326,
+ 324, 327, -247, 337, 339, 342, 344, 353, 354, 356,
+ 363, 370, 365, 371, 373, 376, 378, 379, 386, 186,
+ 385, 429, 184, 392, 387, 389, 186, 391, 383, 393,
+ 397, 394, 399, 395, 396, 401, 422, 403, 409, 411,
+ 412, 413, 449, 419, 383, 423, 434, 459, 464, 451,
+ 460, 461, 466, 462, 476, 483, 477, 507, 484, 487,
+ 492, 485, 486, 497, 498, 499, 500, 501, 502, 504,
+ 503, 512, 169, 330, 252, 165, 94, 176, 489, 375,
+ 345, 341, 473, 181, 182, 0, 323, 390, 0, 254,
+ 0, 0, 307, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 449
};
static const yytype_int16 yycheck[] =
{
- 89, 89, 89, 9, 124, 181, 106, 125, 23, 109,
- 23, 24, 98, 23, 24, 104, 382, 106, 171, 105,
- 109, 107, 108, 77, 23, 38, 162, 0, 38, 5,
- 6, 7, 185, 26, 10, 124, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 358, 38, 62,
- 203, 137, 62, 23, 24, 41, 42, 447, 25, 459,
- 73, 109, 62, 73, 31, 62, 33, 29, 38, 123,
- 8, 119, 472, 73, 464, 37, 73, 70, 108, 445,
- 65, 99, 136, 96, 99, 100, 96, 100, 50, 207,
- 100, 53, 62, 25, 230, 461, 82, 110, 60, 31,
- 110, 100, 69, 73, 71, 118, 96, 260, 118, 420,
- 228, 99, 74, 113, 114, 100, 113, 114, 118, 25,
- 26, 118, 109, 99, 100, 31, 96, 35, 29, 229,
- 100, 34, 119, 29, 40, 97, 98, 109, 224, 71,
- 229, 37, 28, 46, 30, 111, 54, 119, 118, 235,
- 36, 117, 109, 448, 60, 56, 276, 43, 44, 45,
- 99, 47, 119, 49, 60, 71, 72, 100, 27, 29,
- 30, 466, 58, 27, 113, 114, 34, 37, 74, 25,
- 39, 27, 99, 359, 61, 39, 106, 276, 46, 75,
- 76, 68, 112, 39, 283, 61, 3, 4, 284, 59,
- 60, 48, 68, 101, 51, 52, 104, 105, 55, 101,
- 102, 103, 104, 9, 74, 11, 63, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 95, 19,
- 20, 21, 22, 23, 81, 108, 26, 27, 77, 78,
- 79, 80, 99, 100, 113, 114, 23, 24, 99, 100,
- 113, 114, 108, 117, 99, 117, 109, 377, 23, 109,
- 349, 349, 349, 104, 99, 109, 109, 109, 354, 109,
- 100, 109, 109, 109, 99, 109, 23, 64, 111, 65,
- 111, 66, 111, 115, 83, 112, 109, 109, 377, 117,
- 109, 109, 112, 382, 111, 111, 111, 111, 111, 111,
- 386, 111, 111, 111, 109, 109, 117, 104, 23, 104,
- 116, 23, 23, 116, 23, 67, 23, 111, 111, 111,
- 111, 29, 23, 443, 23, 104, 110, 23, 110, 112,
- 118, 111, 23, 109, 109, 23, 23, 23, 112, 112,
- 112, 347, 112, 112, 112, 112, 112, 436, 436, 436,
- 112, 109, 109, 57, 443, 23, 445, 112, 112, 112,
- 23, 112, 112, 32, 109, 109, 66, 106, 111, 111,
- 111, 119, 461, 109, 109, 112, 106, 446, 112, 112,
- 462, 230, 87, 273, 210, 436, 388, 89, 159, 213,
- 139, 89, 253, -1, -1, -1, 198
+ 7, 116, 9, 116, 116, 32, 149, 214, 134, 204,
+ 150, 196, 29, 47, 48, 126, 419, 132, 29, 134,
+ 71, 395, 133, 218, 135, 136, 89, 167, 485, 116,
+ 497, 41, 0, 35, 149, 44, 8, 33, 32, 126,
+ 114, 236, 168, 510, 94, 502, 31, 29, 30, 45,
+ 60, 162, 37, 168, 88, 106, 5, 6, 7, 170,
+ 62, 10, 44, 12, 13, 14, 15, 16, 17, 18,
+ 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+ 483, 131, 76, 268, 458, 148, 68, 29, 30, 106,
+ 29, 30, 77, 102, 105, 106, 499, 79, 161, 486,
+ 240, 35, 44, 298, 118, 44, 9, 31, 11, 43,
+ 124, 33, 105, 37, 31, 39, 33, 504, 105, 169,
+ 102, 105, 56, 45, 106, 59, 68, 68, 45, 68,
+ 31, 32, 66, 120, 121, 117, 37, 79, 79, 68,
+ 79, 267, 89, 125, 171, 46, 80, 3, 4, 40,
+ 79, 75, 267, 77, 40, 266, 105, 106, 105, 106,
+ 102, 52, 273, 102, 106, 66, 52, 106, 116, 103,
+ 104, 314, 34, 35, 36, 117, 77, 78, 126, 120,
+ 121, 43, 35, 125, 125, 105, 125, 67, 116, 396,
+ 43, 120, 121, 34, 74, 36, 125, 116, 126, 314,
+ 106, 42, 115, 65, 66, 115, 321, 126, 49, 50,
+ 51, 322, 53, 66, 55, 67, 243, 54, 80, 112,
+ 57, 58, 74, 64, 61, 107, 119, 80, 110, 111,
+ 105, 106, 69, 107, 108, 109, 110, 105, 106, 122,
+ 81, 82, 19, 20, 21, 22, 23, 114, 25, 26,
+ 87, 90, 91, 92, 93, 94, 95, 96, 97, 98,
+ 99, 100, 101, 105, 106, 115, 105, 106, 29, 30,
+ 385, 414, 385, 385, 83, 84, 85, 86, 30, 31,
+ 391, 33, 120, 121, 120, 121, 114, 105, 105, 124,
+ 124, 116, 116, 116, 116, 116, 116, 116, 106, 414,
+ 116, 116, 116, 116, 419, 116, 29, 105, 118, 29,
+ 29, 118, 423, 118, 118, 70, 116, 123, 119, 116,
+ 123, 116, 124, 116, 118, 72, 118, 118, 118, 118,
+ 118, 118, 118, 118, 116, 116, 71, 110, 481, 119,
+ 124, 119, 110, 29, 29, 29, 73, 118, 118, 118,
+ 29, 118, 35, 29, 29, 117, 119, 110, 117, 474,
+ 125, 474, 474, 119, 118, 116, 481, 116, 483, 119,
+ 29, 119, 29, 119, 119, 29, 383, 119, 29, 119,
+ 119, 119, 389, 116, 499, 116, 29, 119, 29, 63,
+ 119, 119, 29, 119, 119, 116, 38, 500, 116, 72,
+ 484, 118, 118, 118, 126, 116, 116, 119, 112, 112,
+ 119, 119, 99, 268, 171, 95, 27, 114, 474, 311,
+ 291, 280, 425, 116, 116, -1, 253, 335, -1, 173,
+ -1, -1, 231, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 500
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */
static const yytype_uint16 yystos[] =
{
- 0, 3, 4, 121, 122, 0, 123, 8, 124, 125,
- 99, 100, 262, 5, 6, 7, 10, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 126, 127,
- 128, 129, 130, 131, 132, 133, 134, 135, 136, 137,
- 138, 141, 170, 171, 178, 179, 180, 242, 244, 245,
- 248, 261, 262, 108, 246, 99, 99, 99, 65, 100,
- 145, 151, 249, 145, 145, 145, 145, 145, 100, 146,
- 159, 99, 113, 114, 144, 166, 168, 241, 145, 145,
- 108, 108, 9, 11, 99, 247, 117, 117, 111, 117,
- 182, 29, 30, 37, 59, 60, 74, 250, 109, 101,
- 102, 103, 104, 164, 109, 109, 109, 109, 109, 109,
- 104, 161, 101, 104, 105, 163, 23, 24, 38, 62,
- 73, 96, 100, 110, 118, 150, 152, 172, 186, 189,
- 225, 229, 232, 236, 238, 239, 109, 109, 99, 243,
- 109, 100, 172, 23, 181, 185, 189, 225, 235, 237,
- 239, 240, 241, 27, 39, 251, 111, 255, 144, 115,
- 165, 142, 241, 144, 142, 144, 144, 142, 29, 37,
- 60, 74, 177, 34, 46, 28, 30, 36, 43, 44,
- 45, 47, 49, 58, 75, 76, 190, 192, 195, 197,
- 199, 203, 206, 208, 210, 212, 215, 224, 29, 37,
- 50, 53, 60, 74, 97, 98, 173, 150, 240, 163,
- 111, 150, 144, 117, 247, 99, 112, 23, 24, 61,
- 68, 252, 23, 258, 109, 100, 166, 167, 169, 109,
- 110, 143, 150, 238, 109, 109, 61, 68, 254, 255,
- 111, 111, 111, 64, 29, 56, 207, 111, 25, 27,
- 39, 196, 253, 111, 253, 48, 51, 52, 55, 63,
- 81, 219, 26, 70, 211, 111, 257, 255, 66, 254,
- 111, 255, 111, 111, 175, 163, 109, 119, 23, 153,
- 154, 155, 159, 109, 109, 249, 117, 183, 112, 144,
- 116, 116, 163, 142, 143, 104, 162, 83, 139, 144,
- 23, 233, 23, 234, 23, 209, 23, 202, 67, 202,
- 25, 31, 33, 69, 71, 191, 201, 111, 111, 220,
- 111, 255, 41, 42, 82, 216, 217, 23, 260, 29,
- 200, 35, 54, 204, 111, 23, 176, 23, 174, 176,
- 110, 240, 112, 104, 160, 147, 148, 241, 144, 118,
- 110, 111, 256, 109, 109, 112, 112, 112, 112, 112,
- 23, 223, 23, 221, 23, 222, 112, 77, 78, 79,
- 80, 205, 23, 218, 112, 112, 112, 109, 119, 113,
- 114, 156, 109, 23, 149, 262, 109, 62, 73, 184,
- 187, 188, 189, 226, 227, 230, 235, 23, 259, 84,
- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
- 95, 140, 144, 57, 26, 40, 60, 72, 193, 201,
- 253, 112, 112, 112, 112, 240, 23, 157, 23, 158,
- 148, 144, 34, 46, 213, 215, 109, 119, 112, 32,
- 194, 198, 201, 109, 119, 109, 109, 111, 111, 66,
- 214, 187, 240, 148, 139, 228, 233, 231, 234, 111,
- 119, 109, 109, 112, 106, 112, 106, 218, 148, 140,
- 233, 234, 106, 218, 112
+ 0, 3, 4, 128, 129, 0, 130, 8, 131, 132,
+ 105, 106, 277, 5, 6, 7, 10, 12, 13, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+ 25, 26, 27, 28, 105, 106, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
+ 147, 148, 151, 152, 153, 183, 184, 185, 186, 193,
+ 194, 195, 257, 259, 260, 263, 276, 277, 114, 261,
+ 105, 105, 105, 71, 106, 157, 165, 264, 157, 157,
+ 157, 157, 157, 105, 120, 121, 156, 179, 181, 256,
+ 157, 157, 105, 106, 184, 122, 178, 106, 158, 173,
+ 158, 158, 159, 160, 173, 158, 114, 115, 114, 9,
+ 11, 105, 262, 124, 124, 118, 124, 197, 34, 35,
+ 36, 43, 65, 66, 80, 265, 116, 107, 108, 109,
+ 110, 177, 116, 116, 116, 116, 116, 107, 110, 111,
+ 176, 29, 30, 44, 68, 79, 102, 106, 117, 125,
+ 164, 166, 187, 201, 204, 240, 244, 247, 251, 253,
+ 254, 116, 116, 178, 106, 179, 180, 182, 116, 177,
+ 116, 116, 105, 258, 116, 106, 187, 29, 196, 200,
+ 204, 240, 250, 252, 254, 255, 256, 118, 33, 45,
+ 266, 118, 270, 156, 178, 154, 256, 156, 154, 156,
+ 156, 35, 43, 66, 80, 192, 40, 52, 34, 36,
+ 42, 49, 50, 51, 53, 55, 64, 81, 82, 205,
+ 207, 210, 212, 214, 218, 221, 223, 225, 227, 230,
+ 239, 35, 43, 56, 59, 66, 80, 103, 104, 188,
+ 164, 255, 176, 118, 164, 156, 123, 123, 176, 154,
+ 178, 156, 159, 124, 262, 105, 119, 29, 30, 29,
+ 224, 67, 74, 267, 29, 273, 116, 116, 117, 155,
+ 164, 253, 116, 116, 67, 74, 269, 270, 118, 118,
+ 118, 70, 35, 62, 222, 118, 31, 33, 45, 211,
+ 268, 118, 268, 54, 57, 58, 61, 69, 87, 234,
+ 32, 76, 226, 118, 272, 270, 72, 269, 118, 270,
+ 118, 118, 190, 176, 116, 126, 29, 167, 168, 169,
+ 173, 116, 116, 264, 124, 198, 119, 119, 156, 154,
+ 155, 110, 175, 89, 149, 277, 156, 29, 248, 29,
+ 249, 224, 29, 217, 73, 217, 31, 37, 39, 75,
+ 77, 206, 216, 118, 118, 235, 118, 270, 47, 48,
+ 88, 231, 232, 29, 275, 35, 215, 41, 60, 219,
+ 118, 29, 191, 29, 189, 191, 117, 255, 119, 110,
+ 174, 161, 162, 256, 156, 125, 117, 118, 271, 116,
+ 271, 116, 119, 119, 119, 119, 119, 29, 238, 29,
+ 236, 29, 237, 119, 83, 84, 85, 86, 220, 29,
+ 233, 119, 119, 119, 116, 126, 120, 121, 170, 116,
+ 29, 163, 277, 116, 68, 79, 199, 202, 203, 204,
+ 241, 242, 245, 250, 29, 274, 90, 91, 92, 93,
+ 94, 95, 96, 97, 98, 99, 100, 101, 150, 277,
+ 156, 63, 32, 46, 66, 78, 208, 216, 268, 119,
+ 119, 119, 119, 255, 29, 171, 29, 172, 162, 156,
+ 40, 52, 228, 230, 116, 126, 119, 38, 209, 213,
+ 216, 116, 126, 116, 116, 118, 118, 72, 229, 202,
+ 255, 162, 149, 243, 248, 246, 249, 118, 126, 116,
+ 116, 119, 112, 119, 112, 233, 162, 150, 248, 249,
+ 112, 233, 119
};
#define yyerrok (yyerrstatus = 0)
@@ -2119,7 +2183,7 @@ yyreduce:
case 3:
/* Line 1455 of yacc.c */
-#line 272 "program_parse.y"
+#line 280 "program_parse.y"
{
if (state->prog->Target != GL_VERTEX_PROGRAM_ARB) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid fragment program header");
@@ -2132,7 +2196,7 @@ yyreduce:
case 4:
/* Line 1455 of yacc.c */
-#line 280 "program_parse.y"
+#line 288 "program_parse.y"
{
if (state->prog->Target != GL_FRAGMENT_PROGRAM_ARB) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid vertex program header");
@@ -2147,7 +2211,7 @@ yyreduce:
case 7:
/* Line 1455 of yacc.c */
-#line 296 "program_parse.y"
+#line 304 "program_parse.y"
{
int valid = 0;
@@ -2172,7 +2236,7 @@ yyreduce:
case 10:
/* Line 1455 of yacc.c */
-#line 322 "program_parse.y"
+#line 330 "program_parse.y"
{
if ((yyvsp[(1) - (2)].inst) != NULL) {
if (state->inst_tail == NULL) {
@@ -2189,84 +2253,125 @@ yyreduce:
;}
break;
- case 12:
+ case 13:
/* Line 1455 of yacc.c */
-#line 340 "program_parse.y"
+#line 349 "program_parse.y"
{
(yyval.inst) = (yyvsp[(1) - (1)].inst);
state->prog->NumAluInstructions++;
;}
break;
- case 13:
+ case 14:
/* Line 1455 of yacc.c */
-#line 345 "program_parse.y"
+#line 354 "program_parse.y"
{
(yyval.inst) = (yyvsp[(1) - (1)].inst);
state->prog->NumTexInstructions++;
;}
break;
- case 24:
+ case 30:
/* Line 1455 of yacc.c */
-#line 366 "program_parse.y"
+#line 388 "program_parse.y"
{
- (yyval.inst) = asm_instruction_ctor(OPCODE_ARL, & (yyvsp[(2) - (4)].dst_reg), & (yyvsp[(4) - (4)].src_reg), NULL, NULL);
+ (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (4)].temp_inst), & (yyvsp[(2) - (4)].dst_reg), & (yyvsp[(4) - (4)].src_reg), NULL, NULL);
;}
break;
- case 25:
+ case 31:
/* Line 1455 of yacc.c */
-#line 372 "program_parse.y"
+#line 392 "program_parse.y"
{
(yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (4)].temp_inst), & (yyvsp[(2) - (4)].dst_reg), & (yyvsp[(4) - (4)].src_reg), NULL, NULL);
;}
break;
- case 26:
+ case 32:
+
+/* Line 1455 of yacc.c */
+#line 398 "program_parse.y"
+ {
+ (yyval.inst) = asm_instruction_ctor(OPCODE_ARA, & (yyvsp[(2) - (4)].dst_reg), & (yyvsp[(4) - (4)].src_reg), NULL, NULL);
+ ;}
+ break;
+
+ case 33:
+
+/* Line 1455 of yacc.c */
+#line 404 "program_parse.y"
+ {
+ (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (2)].temp_inst), NULL, & (yyvsp[(2) - (2)].src_reg), NULL, NULL);
+ ;}
+ break;
+
+ case 34:
+
+/* Line 1455 of yacc.c */
+#line 408 "program_parse.y"
+ {
+ if ((yyvsp[(2) - (2)].dst_reg).WriteMask != WRITEMASK_XYZW) {
+ yyerror(& (yylsp[(2) - (2)]), state, "POPA only supports .xyzw write mask");
+ YYERROR;
+ }
+
+ (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (2)].temp_inst), & (yyvsp[(2) - (2)].dst_reg), NULL, NULL, NULL);
+ ;}
+ break;
+
+ case 35:
/* Line 1455 of yacc.c */
-#line 378 "program_parse.y"
+#line 420 "program_parse.y"
{
(yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (4)].temp_inst), & (yyvsp[(2) - (4)].dst_reg), & (yyvsp[(4) - (4)].src_reg), NULL, NULL);
;}
break;
- case 27:
+ case 36:
+
+/* Line 1455 of yacc.c */
+#line 426 "program_parse.y"
+ {
+ (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (4)].temp_inst), & (yyvsp[(2) - (4)].dst_reg), & (yyvsp[(4) - (4)].src_reg), NULL, NULL);
+ ;}
+ break;
+
+ case 37:
/* Line 1455 of yacc.c */
-#line 384 "program_parse.y"
+#line 432 "program_parse.y"
{
(yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (6)].temp_inst), & (yyvsp[(2) - (6)].dst_reg), & (yyvsp[(4) - (6)].src_reg), & (yyvsp[(6) - (6)].src_reg), NULL);
;}
break;
- case 28:
+ case 38:
/* Line 1455 of yacc.c */
-#line 391 "program_parse.y"
+#line 439 "program_parse.y"
{
(yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (6)].temp_inst), & (yyvsp[(2) - (6)].dst_reg), & (yyvsp[(4) - (6)].src_reg), & (yyvsp[(6) - (6)].src_reg), NULL);
;}
break;
- case 29:
+ case 39:
/* Line 1455 of yacc.c */
-#line 398 "program_parse.y"
+#line 446 "program_parse.y"
{
(yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (8)].temp_inst), & (yyvsp[(2) - (8)].dst_reg), & (yyvsp[(4) - (8)].src_reg), & (yyvsp[(6) - (8)].src_reg), & (yyvsp[(8) - (8)].src_reg));
;}
break;
- case 30:
+ case 40:
/* Line 1455 of yacc.c */
-#line 404 "program_parse.y"
+#line 452 "program_parse.y"
{
(yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (8)].temp_inst), & (yyvsp[(2) - (8)].dst_reg), & (yyvsp[(4) - (8)].src_reg), NULL, NULL);
if ((yyval.inst) != NULL) {
@@ -2310,20 +2415,20 @@ yyreduce:
;}
break;
- case 31:
+ case 41:
/* Line 1455 of yacc.c */
-#line 448 "program_parse.y"
+#line 496 "program_parse.y"
{
(yyval.inst) = asm_instruction_ctor(OPCODE_KIL, NULL, & (yyvsp[(2) - (2)].src_reg), NULL, NULL);
state->fragment.UsesKill = 1;
;}
break;
- case 32:
+ case 42:
/* Line 1455 of yacc.c */
-#line 453 "program_parse.y"
+#line 501 "program_parse.y"
{
(yyval.inst) = asm_instruction_ctor(OPCODE_KIL_NV, NULL, NULL, NULL, NULL);
(yyval.inst)->Base.DstReg.CondMask = (yyvsp[(2) - (2)].dst_reg).CondMask;
@@ -2333,10 +2438,10 @@ yyreduce:
;}
break;
- case 33:
+ case 43:
/* Line 1455 of yacc.c */
-#line 463 "program_parse.y"
+#line 511 "program_parse.y"
{
(yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (12)].temp_inst), & (yyvsp[(2) - (12)].dst_reg), & (yyvsp[(4) - (12)].src_reg), & (yyvsp[(6) - (12)].src_reg), & (yyvsp[(8) - (12)].src_reg));
if ((yyval.inst) != NULL) {
@@ -2380,103 +2485,166 @@ yyreduce:
;}
break;
- case 34:
+ case 44:
/* Line 1455 of yacc.c */
-#line 507 "program_parse.y"
+#line 555 "program_parse.y"
{
(yyval.integer) = (yyvsp[(2) - (2)].integer);
;}
break;
- case 35:
+ case 45:
+
+/* Line 1455 of yacc.c */
+#line 559 "program_parse.y"
+ {
+ /* The NV_vertex_program3 spec is just plain broken. While
+ * ARB_fragment_program correctly makes "texture" a reserved word,
+ * NV_vp3 does not. To work around this, the lexer treats it as
+ * IDENTIFIER or USED_IDENTIFIER, and the parser has to do the
+ * matching.
+ */
+ if (strcmp("texture", (yyvsp[(1) - (2)].string)) == 0) {
+ (yyval.integer) = (yyvsp[(2) - (2)].integer);
+ } else {
+ yyerror(& (yylsp[(1) - (2)]), state, "expected \"texture\", got IDENTIFIER");
+ YYERROR;
+ }
+ ;}
+ break;
+
+ case 46:
/* Line 1455 of yacc.c */
-#line 512 "program_parse.y"
+#line 575 "program_parse.y"
{ (yyval.integer) = TEXTURE_1D_INDEX; ;}
break;
- case 36:
+ case 47:
/* Line 1455 of yacc.c */
-#line 513 "program_parse.y"
+#line 576 "program_parse.y"
{ (yyval.integer) = TEXTURE_2D_INDEX; ;}
break;
- case 37:
+ case 48:
/* Line 1455 of yacc.c */
-#line 514 "program_parse.y"
+#line 577 "program_parse.y"
{ (yyval.integer) = TEXTURE_3D_INDEX; ;}
break;
- case 38:
+ case 49:
/* Line 1455 of yacc.c */
-#line 515 "program_parse.y"
+#line 578 "program_parse.y"
{ (yyval.integer) = TEXTURE_CUBE_INDEX; ;}
break;
- case 39:
+ case 50:
/* Line 1455 of yacc.c */
-#line 516 "program_parse.y"
+#line 579 "program_parse.y"
{ (yyval.integer) = TEXTURE_RECT_INDEX; ;}
break;
- case 40:
+ case 51:
/* Line 1455 of yacc.c */
-#line 517 "program_parse.y"
+#line 580 "program_parse.y"
{ (yyval.integer) = -TEXTURE_1D_INDEX; ;}
break;
- case 41:
+ case 52:
/* Line 1455 of yacc.c */
-#line 518 "program_parse.y"
+#line 581 "program_parse.y"
{ (yyval.integer) = -TEXTURE_2D_INDEX; ;}
break;
- case 42:
+ case 53:
/* Line 1455 of yacc.c */
-#line 519 "program_parse.y"
+#line 582 "program_parse.y"
{ (yyval.integer) = -TEXTURE_RECT_INDEX; ;}
break;
- case 43:
+ case 54:
/* Line 1455 of yacc.c */
-#line 520 "program_parse.y"
+#line 583 "program_parse.y"
{ (yyval.integer) = TEXTURE_1D_ARRAY_INDEX; ;}
break;
- case 44:
+ case 55:
/* Line 1455 of yacc.c */
-#line 521 "program_parse.y"
+#line 584 "program_parse.y"
{ (yyval.integer) = TEXTURE_2D_ARRAY_INDEX; ;}
break;
- case 45:
+ case 56:
/* Line 1455 of yacc.c */
-#line 522 "program_parse.y"
+#line 585 "program_parse.y"
{ (yyval.integer) = -TEXTURE_1D_ARRAY_INDEX; ;}
break;
- case 46:
+ case 57:
/* Line 1455 of yacc.c */
-#line 523 "program_parse.y"
+#line 586 "program_parse.y"
{ (yyval.integer) = -TEXTURE_2D_ARRAY_INDEX; ;}
break;
- case 47:
+ case 58:
/* Line 1455 of yacc.c */
-#line 527 "program_parse.y"
+#line 588 "program_parse.y"
+ {
+ int valid = 0;
+
+ /* The NV_vertex_program3 spec is just plain broken. While
+ * ARB_fragment_program correctly makes SHADOW1D, SHADOW2D, CUBE,
+ * and RECT reserved words, NV_vp3 does not. To work around this,
+ * the lexer treats these as IDENTIFIER or USED_IDENTIFIER, and the
+ * parser has to do the matching.
+ */
+ if (state->option.NV_vertex3) {
+ if (strncmp("SHADOW", (yyvsp[(1) - (1)].string), 6) == 0) {
+ const char *const subTarget = & (yyvsp[(1) - (1)].string)[6];
+
+ if (strcmp("1D", subTarget) == 0) {
+ (yyval.integer) = -TEXTURE_1D_INDEX;
+ valid = state->option.Shadow;
+ } else if (strcmp("2D", subTarget) == 0) {
+ (yyval.integer) = -TEXTURE_2D_INDEX;
+ valid = state->option.Shadow;
+ } else if (strcmp("RECT", subTarget) == 0) {
+ (yyval.integer) = -TEXTURE_RECT_INDEX;
+ valid = state->option.Shadow && state->option.TexRect;
+ }
+ } else if (strcmp("CUBE", (yyvsp[(1) - (1)].string)) == 0) {
+ (yyval.integer) = TEXTURE_CUBE_INDEX;
+ valid = 1;
+ } else if (strcmp("RECT", (yyvsp[(1) - (1)].string)) == 0) {
+ (yyval.integer) = TEXTURE_RECT_INDEX;
+ valid = state->option.TexRect;
+ }
+ }
+
+ if (!valid) {
+ yyerror(& (yylsp[(1) - (1)]), state, "invalid texture target");
+ YYERROR;
+ }
+ ;}
+ break;
+
+ case 59:
+
+/* Line 1455 of yacc.c */
+#line 628 "program_parse.y"
{
/* FIXME: Is this correct? Should the extenedSwizzle be applied
* FIXME: to the existing swizzle?
@@ -2488,10 +2656,43 @@ yyreduce:
;}
break;
- case 48:
+ case 60:
/* Line 1455 of yacc.c */
-#line 539 "program_parse.y"
+#line 640 "program_parse.y"
+ {
+ (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (3)].temp_inst), NULL, NULL, NULL, NULL);
+
+ /* Since we don't know whether or not the branch label is valid,
+ * store the position of the label. This allows use to generate a
+ * sensible error message later.
+ */
+ (yyval.inst)->Base.Data = (yyvsp[(2) - (3)].string);
+ (yyval.inst)->position = (yylsp[(2) - (3)]);
+
+ (yyval.inst)->Base.DstReg.CondMask = (yyvsp[(3) - (3)].dst_reg).CondMask;
+ (yyval.inst)->Base.DstReg.CondSwizzle = (yyvsp[(3) - (3)].dst_reg).CondSwizzle;
+ (yyval.inst)->Base.DstReg.CondSrc = (yyvsp[(3) - (3)].dst_reg).CondSrc;
+ ;}
+ break;
+
+ case 61:
+
+/* Line 1455 of yacc.c */
+#line 657 "program_parse.y"
+ {
+ (yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (2)].temp_inst), NULL, NULL, NULL, NULL);
+
+ (yyval.inst)->Base.DstReg.CondMask = (yyvsp[(2) - (2)].dst_reg).CondMask;
+ (yyval.inst)->Base.DstReg.CondSwizzle = (yyvsp[(2) - (2)].dst_reg).CondSwizzle;
+ (yyval.inst)->Base.DstReg.CondSrc = (yyvsp[(2) - (2)].dst_reg).CondSrc;
+ ;}
+ break;
+
+ case 62:
+
+/* Line 1455 of yacc.c */
+#line 667 "program_parse.y"
{
(yyval.src_reg) = (yyvsp[(2) - (2)].src_reg);
@@ -2501,14 +2702,14 @@ yyreduce:
;}
break;
- case 49:
+ case 63:
/* Line 1455 of yacc.c */
-#line 547 "program_parse.y"
+#line 675 "program_parse.y"
{
(yyval.src_reg) = (yyvsp[(3) - (4)].src_reg);
- if (!state->option.NV_fragment) {
+ if (!state->option.NV_fragment && !state->option.NV_vertex2) {
yyerror(& (yylsp[(2) - (4)]), state, "unexpected character '|'");
YYERROR;
}
@@ -2521,10 +2722,10 @@ yyreduce:
;}
break;
- case 50:
+ case 64:
/* Line 1455 of yacc.c */
-#line 564 "program_parse.y"
+#line 692 "program_parse.y"
{
(yyval.src_reg) = (yyvsp[(1) - (2)].src_reg);
@@ -2533,14 +2734,14 @@ yyreduce:
;}
break;
- case 51:
+ case 65:
/* Line 1455 of yacc.c */
-#line 571 "program_parse.y"
+#line 699 "program_parse.y"
{
struct asm_symbol temp_sym;
- if (!state->option.NV_fragment) {
+ if (!state->option.NV_fragment && !state->option.NV_vertex2) {
yyerror(& (yylsp[(1) - (1)]), state, "expected scalar suffix");
YYERROR;
}
@@ -2555,10 +2756,10 @@ yyreduce:
;}
break;
- case 52:
+ case 66:
/* Line 1455 of yacc.c */
-#line 590 "program_parse.y"
+#line 718 "program_parse.y"
{
(yyval.src_reg) = (yyvsp[(2) - (3)].src_reg);
@@ -2571,14 +2772,14 @@ yyreduce:
;}
break;
- case 53:
+ case 67:
/* Line 1455 of yacc.c */
-#line 601 "program_parse.y"
+#line 729 "program_parse.y"
{
(yyval.src_reg) = (yyvsp[(3) - (5)].src_reg);
- if (!state->option.NV_fragment) {
+ if (!state->option.NV_fragment && !state->option.NV_vertex2) {
yyerror(& (yylsp[(2) - (5)]), state, "unexpected character '|'");
YYERROR;
}
@@ -2593,10 +2794,10 @@ yyreduce:
;}
break;
- case 54:
+ case 68:
/* Line 1455 of yacc.c */
-#line 621 "program_parse.y"
+#line 749 "program_parse.y"
{
(yyval.dst_reg) = (yyvsp[(1) - (3)].dst_reg);
(yyval.dst_reg).WriteMask = (yyvsp[(2) - (3)].swiz_mask).mask;
@@ -2621,22 +2822,45 @@ yyreduce:
;}
break;
- case 55:
+ case 69:
/* Line 1455 of yacc.c */
-#line 646 "program_parse.y"
+#line 774 "program_parse.y"
{
+ if (!state->option.NV_vertex2) {
+ if ((yyvsp[(2) - (3)].swiz_mask).mask != WRITEMASK_X) {
+ yyerror(& (yylsp[(2) - (3)]), state,
+ "address register write mask must be \".x\"");
+ YYERROR;
+ }
+ }
+
init_dst_reg(& (yyval.dst_reg));
(yyval.dst_reg).File = PROGRAM_ADDRESS;
- (yyval.dst_reg).Index = 0;
- (yyval.dst_reg).WriteMask = (yyvsp[(2) - (2)].swiz_mask).mask;
+ (yyval.dst_reg).Index = (yyvsp[(1) - (3)].sym)->binding;
+ (yyval.dst_reg).WriteMask = (yyvsp[(2) - (3)].swiz_mask).mask;
+ (yyval.dst_reg).CondMask = (yyvsp[(3) - (3)].dst_reg).CondMask;
+ (yyval.dst_reg).CondSwizzle = (yyvsp[(3) - (3)].dst_reg).CondSwizzle;
+ (yyval.dst_reg).CondSrc = (yyvsp[(3) - (3)].dst_reg).CondSrc;
;}
break;
- case 56:
+ case 71:
+
+/* Line 1455 of yacc.c */
+#line 799 "program_parse.y"
+ {
+ init_src_reg(& (yyval.src_reg));
+ (yyval.src_reg).Base.File = PROGRAM_ADDRESS;
+ (yyval.src_reg).Base.Index = (yyvsp[(1) - (1)].sym)->binding;
+ (yyval.src_reg).Symbol = (yyvsp[(1) - (1)].sym);
+ ;}
+ break;
+
+ case 72:
/* Line 1455 of yacc.c */
-#line 655 "program_parse.y"
+#line 808 "program_parse.y"
{
const unsigned xyzw_valid =
((yyvsp[(1) - (7)].ext_swizzle).xyzw_valid << 0)
@@ -2669,20 +2893,20 @@ yyreduce:
;}
break;
- case 57:
+ case 73:
/* Line 1455 of yacc.c */
-#line 688 "program_parse.y"
+#line 841 "program_parse.y"
{
(yyval.ext_swizzle) = (yyvsp[(2) - (2)].ext_swizzle);
(yyval.ext_swizzle).negate = ((yyvsp[(1) - (2)].negate)) ? 1 : 0;
;}
break;
- case 58:
+ case 74:
/* Line 1455 of yacc.c */
-#line 695 "program_parse.y"
+#line 848 "program_parse.y"
{
if (((yyvsp[(1) - (1)].integer) != 0) && ((yyvsp[(1) - (1)].integer) != 1)) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid extended swizzle selector");
@@ -2699,10 +2923,10 @@ yyreduce:
;}
break;
- case 59:
+ case 75:
/* Line 1455 of yacc.c */
-#line 710 "program_parse.y"
+#line 863 "program_parse.y"
{
if (strlen((yyvsp[(1) - (1)].string)) > 1) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid extended swizzle selector");
@@ -2752,10 +2976,10 @@ yyreduce:
;}
break;
- case 60:
+ case 76:
/* Line 1455 of yacc.c */
-#line 760 "program_parse.y"
+#line 913 "program_parse.y"
{
struct asm_symbol *const s = (struct asm_symbol *)
_mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(1) - (1)].string));
@@ -2776,7 +3000,7 @@ yyreduce:
switch (s->type) {
case at_temp:
(yyval.src_reg).Base.File = PROGRAM_TEMPORARY;
- (yyval.src_reg).Base.Index = s->temp_binding;
+ (yyval.src_reg).Base.Index = s->binding;
break;
case at_param:
(yyval.src_reg).Base.File = s->param_binding_type;
@@ -2784,7 +3008,7 @@ yyreduce:
break;
case at_attrib:
(yyval.src_reg).Base.File = PROGRAM_INPUT;
- (yyval.src_reg).Base.Index = s->attrib_binding;
+ (yyval.src_reg).Base.Index = s->binding;
state->prog->InputsRead |= (1U << (yyval.src_reg).Base.Index);
if (!validate_inputs(& (yylsp[(1) - (1)]), state)) {
@@ -2799,10 +3023,10 @@ yyreduce:
;}
break;
- case 61:
+ case 77:
/* Line 1455 of yacc.c */
-#line 802 "program_parse.y"
+#line 955 "program_parse.y"
{
init_src_reg(& (yyval.src_reg));
(yyval.src_reg).Base.File = PROGRAM_INPUT;
@@ -2815,10 +3039,10 @@ yyreduce:
;}
break;
- case 62:
+ case 78:
/* Line 1455 of yacc.c */
-#line 813 "program_parse.y"
+#line 966 "program_parse.y"
{
if (! (yyvsp[(3) - (4)].src_reg).Base.RelAddr
&& ((unsigned) (yyvsp[(3) - (4)].src_reg).Base.Index >= (yyvsp[(1) - (4)].sym)->param_binding_length)) {
@@ -2834,6 +3058,8 @@ yyreduce:
(yyval.src_reg).Base.RelAddr = 1;
(yyval.src_reg).Base.Index = (yyvsp[(3) - (4)].src_reg).Base.Index;
+ (yyval.src_reg).Base.AddrReg = (yyvsp[(3) - (4)].src_reg).Base.AddrReg;
+ (yyval.src_reg).Base.AddrComponent = (yyvsp[(3) - (4)].src_reg).Base.AddrComponent;
(yyval.src_reg).Symbol = (yyvsp[(1) - (4)].sym);
} else {
(yyval.src_reg).Base.Index = (yyvsp[(1) - (4)].sym)->param_binding_begin + (yyvsp[(3) - (4)].src_reg).Base.Index;
@@ -2841,10 +3067,10 @@ yyreduce:
;}
break;
- case 63:
+ case 79:
/* Line 1455 of yacc.c */
-#line 834 "program_parse.y"
+#line 989 "program_parse.y"
{
init_src_reg(& (yyval.src_reg));
(yyval.src_reg).Base.File = ((yyvsp[(1) - (1)].temp_sym).name != NULL)
@@ -2854,10 +3080,10 @@ yyreduce:
;}
break;
- case 64:
+ case 80:
/* Line 1455 of yacc.c */
-#line 844 "program_parse.y"
+#line 999 "program_parse.y"
{
init_dst_reg(& (yyval.dst_reg));
(yyval.dst_reg).File = PROGRAM_OUTPUT;
@@ -2865,10 +3091,10 @@ yyreduce:
;}
break;
- case 65:
+ case 81:
/* Line 1455 of yacc.c */
-#line 850 "program_parse.y"
+#line 1005 "program_parse.y"
{
struct asm_symbol *const s = (struct asm_symbol *)
_mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(1) - (1)].string));
@@ -2885,11 +3111,11 @@ yyreduce:
switch (s->type) {
case at_temp:
(yyval.dst_reg).File = PROGRAM_TEMPORARY;
- (yyval.dst_reg).Index = s->temp_binding;
+ (yyval.dst_reg).Index = s->binding;
break;
case at_output:
(yyval.dst_reg).File = PROGRAM_OUTPUT;
- (yyval.dst_reg).Index = s->output_binding;
+ (yyval.dst_reg).Index = s->binding;
break;
default:
(yyval.dst_reg).File = s->param_binding_type;
@@ -2899,10 +3125,10 @@ yyreduce:
;}
break;
- case 66:
+ case 82:
/* Line 1455 of yacc.c */
-#line 881 "program_parse.y"
+#line 1036 "program_parse.y"
{
struct asm_symbol *const s = (struct asm_symbol *)
_mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(1) - (1)].string));
@@ -2919,56 +3145,54 @@ yyreduce:
;}
break;
- case 69:
+ case 85:
/* Line 1455 of yacc.c */
-#line 900 "program_parse.y"
+#line 1055 "program_parse.y"
{
init_src_reg(& (yyval.src_reg));
(yyval.src_reg).Base.Index = (yyvsp[(1) - (1)].integer);
;}
break;
- case 70:
+ case 86:
/* Line 1455 of yacc.c */
-#line 907 "program_parse.y"
+#line 1062 "program_parse.y"
{
- /* FINISHME: Add support for multiple address registers.
- */
- /* FINISHME: Add support for 4-component address registers.
- */
init_src_reg(& (yyval.src_reg));
(yyval.src_reg).Base.RelAddr = 1;
(yyval.src_reg).Base.Index = (yyvsp[(3) - (3)].integer);
+ (yyval.src_reg).Base.AddrReg = (yyvsp[(1) - (3)].sym)->binding;
+ (yyval.src_reg).Base.AddrComponent = (yyvsp[(2) - (3)].integer);
;}
break;
- case 71:
+ case 87:
/* Line 1455 of yacc.c */
-#line 918 "program_parse.y"
+#line 1071 "program_parse.y"
{ (yyval.integer) = 0; ;}
break;
- case 72:
+ case 88:
/* Line 1455 of yacc.c */
-#line 919 "program_parse.y"
+#line 1072 "program_parse.y"
{ (yyval.integer) = (yyvsp[(2) - (2)].integer); ;}
break;
- case 73:
+ case 89:
/* Line 1455 of yacc.c */
-#line 920 "program_parse.y"
+#line 1073 "program_parse.y"
{ (yyval.integer) = -(yyvsp[(2) - (2)].integer); ;}
break;
- case 74:
+ case 90:
/* Line 1455 of yacc.c */
-#line 924 "program_parse.y"
+#line 1077 "program_parse.y"
{
if (((yyvsp[(1) - (1)].integer) < 0) || ((yyvsp[(1) - (1)].integer) > 63)) {
char s[100];
@@ -2982,10 +3206,10 @@ yyreduce:
;}
break;
- case 75:
+ case 91:
/* Line 1455 of yacc.c */
-#line 938 "program_parse.y"
+#line 1091 "program_parse.y"
{
if (((yyvsp[(1) - (1)].integer) < 0) || ((yyvsp[(1) - (1)].integer) > 64)) {
char s[100];
@@ -2999,10 +3223,10 @@ yyreduce:
;}
break;
- case 76:
+ case 92:
/* Line 1455 of yacc.c */
-#line 952 "program_parse.y"
+#line 1105 "program_parse.y"
{
struct asm_symbol *const s = (struct asm_symbol *)
_mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(1) - (1)].string));
@@ -3020,71 +3244,80 @@ yyreduce:
;}
break;
- case 77:
+ case 93:
/* Line 1455 of yacc.c */
-#line 970 "program_parse.y"
+#line 1123 "program_parse.y"
{
- if ((yyvsp[(1) - (1)].swiz_mask).mask != WRITEMASK_X) {
+ if (!state->option.NV_vertex2 && ((yyvsp[(1) - (1)].swiz_mask).mask != WRITEMASK_X)) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid address component selector");
YYERROR;
} else {
- (yyval.swiz_mask) = (yyvsp[(1) - (1)].swiz_mask);
- }
- ;}
- break;
-
- case 78:
-
-/* Line 1455 of yacc.c */
-#line 981 "program_parse.y"
- {
- if ((yyvsp[(1) - (1)].swiz_mask).mask != WRITEMASK_X) {
- yyerror(& (yylsp[(1) - (1)]), state,
- "address register write mask must be \".x\"");
- YYERROR;
- } else {
- (yyval.swiz_mask) = (yyvsp[(1) - (1)].swiz_mask);
+ switch ((yyvsp[(1) - (1)].swiz_mask).mask) {
+ case WRITEMASK_X: (yyval.integer) = 0; break;
+ case WRITEMASK_Y: (yyval.integer) = 1; break;
+ case WRITEMASK_Z: (yyval.integer) = 2; break;
+ case WRITEMASK_W: (yyval.integer) = 3; break;
+
+ /* It should be impossible to get here because the RHS of the
+ * production is MASK1.
+ */
+ default: YYERROR; break;
+ }
}
;}
break;
- case 83:
+ case 98:
/* Line 1455 of yacc.c */
-#line 997 "program_parse.y"
+#line 1148 "program_parse.y"
{ (yyval.swiz_mask).swizzle = SWIZZLE_NOOP; (yyval.swiz_mask).mask = WRITEMASK_XYZW; ;}
break;
- case 88:
+ case 103:
/* Line 1455 of yacc.c */
-#line 1001 "program_parse.y"
+#line 1152 "program_parse.y"
{ (yyval.swiz_mask).swizzle = SWIZZLE_NOOP; (yyval.swiz_mask).mask = WRITEMASK_XYZW; ;}
break;
- case 89:
+ case 104:
/* Line 1455 of yacc.c */
-#line 1005 "program_parse.y"
+#line 1156 "program_parse.y"
{
+ if (!state->option.NV_vertex2
+ && !state->option.NV_fragment) {
+ yyerror(& (yylsp[(1) - (3)]), state,
+ "conditional write mask invalid in this program mode");
+ YYERROR;
+ }
+
(yyval.dst_reg) = (yyvsp[(2) - (3)].dst_reg);
;}
break;
- case 90:
+ case 105:
/* Line 1455 of yacc.c */
-#line 1009 "program_parse.y"
+#line 1167 "program_parse.y"
{
+ if (!state->option.NV_vertex2
+ && !state->option.NV_fragment) {
+ yyerror(& (yylsp[(1) - (3)]), state,
+ "conditional write mask invalid in this program mode");
+ YYERROR;
+ }
+
(yyval.dst_reg) = (yyvsp[(2) - (3)].dst_reg);
;}
break;
- case 91:
+ case 106:
/* Line 1455 of yacc.c */
-#line 1013 "program_parse.y"
+#line 1178 "program_parse.y"
{
(yyval.dst_reg).CondMask = COND_TR;
(yyval.dst_reg).CondSwizzle = SWIZZLE_NOOP;
@@ -3092,33 +3325,33 @@ yyreduce:
;}
break;
- case 92:
+ case 107:
/* Line 1455 of yacc.c */
-#line 1021 "program_parse.y"
+#line 1186 "program_parse.y"
{
(yyval.dst_reg) = (yyvsp[(1) - (2)].dst_reg);
(yyval.dst_reg).CondSwizzle = (yyvsp[(2) - (2)].swiz_mask).swizzle;
;}
break;
- case 93:
+ case 108:
/* Line 1455 of yacc.c */
-#line 1028 "program_parse.y"
+#line 1193 "program_parse.y"
{
(yyval.dst_reg) = (yyvsp[(1) - (2)].dst_reg);
(yyval.dst_reg).CondSwizzle = (yyvsp[(2) - (2)].swiz_mask).swizzle;
;}
break;
- case 94:
+ case 109:
/* Line 1455 of yacc.c */
-#line 1035 "program_parse.y"
+#line 1200 "program_parse.y"
{
- const int cond = _mesa_parse_cc((yyvsp[(1) - (1)].string));
- if ((cond == 0) || ((yyvsp[(1) - (1)].string)[2] != '\0')) {
+ const int good_cond = _mesa_parse_cc(state, (yyvsp[(1) - (1)].string), & (yyval.dst_reg));
+ if (! good_cond) {
char *const err_str =
make_error_string("invalid condition code \"%s\"", (yyvsp[(1) - (1)].string));
@@ -3132,19 +3365,17 @@ yyreduce:
YYERROR;
}
- (yyval.dst_reg).CondMask = cond;
(yyval.dst_reg).CondSwizzle = SWIZZLE_NOOP;
- (yyval.dst_reg).CondSrc = 0;
;}
break;
- case 95:
+ case 110:
/* Line 1455 of yacc.c */
-#line 1058 "program_parse.y"
+#line 1221 "program_parse.y"
{
- const int cond = _mesa_parse_cc((yyvsp[(1) - (1)].string));
- if ((cond == 0) || ((yyvsp[(1) - (1)].string)[2] != '\0')) {
+ const int good_cond = _mesa_parse_cc(state, (yyvsp[(1) - (1)].string), & (yyval.dst_reg));
+ if (! good_cond) {
char *const err_str =
make_error_string("invalid condition code \"%s\"", (yyvsp[(1) - (1)].string));
@@ -3158,16 +3389,36 @@ yyreduce:
YYERROR;
}
- (yyval.dst_reg).CondMask = cond;
(yyval.dst_reg).CondSwizzle = SWIZZLE_NOOP;
- (yyval.dst_reg).CondSrc = 0;
;}
break;
- case 102:
+ case 111:
/* Line 1455 of yacc.c */
-#line 1089 "program_parse.y"
+#line 1242 "program_parse.y"
+ {
+ const void *const label =
+ _mesa_symbol_table_find_symbol(state->st, 1, (yyvsp[(1) - (1)].string));
+
+ if (label != NULL) {
+ yyerror(& (yylsp[(1) - (1)]), state, "duplicate label");
+ YYERROR;
+ } else {
+ /* We have to bias the offset by one so that we don't add a
+ * symbol with zero value. That will fail the symbol existence
+ * test above.
+ */
+ const intptr_t offset = state->prog->NumInstructions + 1;
+ _mesa_symbol_table_add_symbol(state->st, 1, (yyvsp[(1) - (1)].string), (void *) offset);
+ }
+ ;}
+ break;
+
+ case 120:
+
+/* Line 1455 of yacc.c */
+#line 1272 "program_parse.y"
{
struct asm_symbol *const s =
declare_variable(state, (yyvsp[(2) - (4)].string), at_attrib, & (yylsp[(2) - (4)]));
@@ -3175,8 +3426,8 @@ yyreduce:
if (s == NULL) {
YYERROR;
} else {
- s->attrib_binding = (yyvsp[(4) - (4)].attrib);
- state->InputsBound |= (1U << s->attrib_binding);
+ s->binding = (yyvsp[(4) - (4)].attrib);
+ state->InputsBound |= (1U << s->binding);
if (!validate_inputs(& (yylsp[(4) - (4)]), state)) {
YYERROR;
@@ -3185,55 +3436,55 @@ yyreduce:
;}
break;
- case 103:
+ case 121:
/* Line 1455 of yacc.c */
-#line 1107 "program_parse.y"
+#line 1290 "program_parse.y"
{
(yyval.attrib) = (yyvsp[(2) - (2)].attrib);
;}
break;
- case 104:
+ case 122:
/* Line 1455 of yacc.c */
-#line 1111 "program_parse.y"
+#line 1294 "program_parse.y"
{
(yyval.attrib) = (yyvsp[(2) - (2)].attrib);
;}
break;
- case 105:
+ case 123:
/* Line 1455 of yacc.c */
-#line 1117 "program_parse.y"
+#line 1300 "program_parse.y"
{
(yyval.attrib) = VERT_ATTRIB_POS;
;}
break;
- case 106:
+ case 124:
/* Line 1455 of yacc.c */
-#line 1121 "program_parse.y"
+#line 1304 "program_parse.y"
{
(yyval.attrib) = VERT_ATTRIB_WEIGHT;
;}
break;
- case 107:
+ case 125:
/* Line 1455 of yacc.c */
-#line 1125 "program_parse.y"
+#line 1308 "program_parse.y"
{
(yyval.attrib) = VERT_ATTRIB_NORMAL;
;}
break;
- case 108:
+ case 126:
/* Line 1455 of yacc.c */
-#line 1129 "program_parse.y"
+#line 1312 "program_parse.y"
{
if (!state->ctx->Extensions.EXT_secondary_color) {
yyerror(& (yylsp[(2) - (2)]), state, "GL_EXT_secondary_color not supported");
@@ -3244,10 +3495,10 @@ yyreduce:
;}
break;
- case 109:
+ case 127:
/* Line 1455 of yacc.c */
-#line 1138 "program_parse.y"
+#line 1321 "program_parse.y"
{
if (!state->ctx->Extensions.EXT_fog_coord) {
yyerror(& (yylsp[(1) - (1)]), state, "GL_EXT_fog_coord not supported");
@@ -3258,38 +3509,38 @@ yyreduce:
;}
break;
- case 110:
+ case 128:
/* Line 1455 of yacc.c */
-#line 1147 "program_parse.y"
+#line 1330 "program_parse.y"
{
(yyval.attrib) = VERT_ATTRIB_TEX0 + (yyvsp[(2) - (2)].integer);
;}
break;
- case 111:
+ case 129:
/* Line 1455 of yacc.c */
-#line 1151 "program_parse.y"
+#line 1334 "program_parse.y"
{
yyerror(& (yylsp[(1) - (4)]), state, "GL_ARB_matrix_palette not supported");
YYERROR;
;}
break;
- case 112:
+ case 130:
/* Line 1455 of yacc.c */
-#line 1156 "program_parse.y"
+#line 1339 "program_parse.y"
{
(yyval.attrib) = VERT_ATTRIB_GENERIC0 + (yyvsp[(3) - (4)].integer);
;}
break;
- case 113:
+ case 131:
/* Line 1455 of yacc.c */
-#line 1162 "program_parse.y"
+#line 1345 "program_parse.y"
{
if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->limits->MaxAttribs) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid vertex attribute reference");
@@ -3300,46 +3551,46 @@ yyreduce:
;}
break;
- case 117:
+ case 135:
/* Line 1455 of yacc.c */
-#line 1176 "program_parse.y"
+#line 1359 "program_parse.y"
{
(yyval.attrib) = FRAG_ATTRIB_WPOS;
;}
break;
- case 118:
+ case 136:
/* Line 1455 of yacc.c */
-#line 1180 "program_parse.y"
+#line 1363 "program_parse.y"
{
(yyval.attrib) = FRAG_ATTRIB_COL0 + (yyvsp[(2) - (2)].integer);
;}
break;
- case 119:
+ case 137:
/* Line 1455 of yacc.c */
-#line 1184 "program_parse.y"
+#line 1367 "program_parse.y"
{
(yyval.attrib) = FRAG_ATTRIB_FOGC;
;}
break;
- case 120:
+ case 138:
/* Line 1455 of yacc.c */
-#line 1188 "program_parse.y"
+#line 1371 "program_parse.y"
{
(yyval.attrib) = FRAG_ATTRIB_TEX0 + (yyvsp[(2) - (2)].integer);
;}
break;
- case 123:
+ case 141:
/* Line 1455 of yacc.c */
-#line 1196 "program_parse.y"
+#line 1379 "program_parse.y"
{
struct asm_symbol *const s =
declare_variable(state, (yyvsp[(2) - (3)].string), at_param, & (yylsp[(2) - (3)]));
@@ -3355,10 +3606,10 @@ yyreduce:
;}
break;
- case 124:
+ case 142:
/* Line 1455 of yacc.c */
-#line 1212 "program_parse.y"
+#line 1395 "program_parse.y"
{
if (((yyvsp[(4) - (6)].integer) != 0) && ((unsigned) (yyvsp[(4) - (6)].integer) != (yyvsp[(6) - (6)].temp_sym).param_binding_length)) {
yyerror(& (yylsp[(4) - (6)]), state,
@@ -3380,19 +3631,19 @@ yyreduce:
;}
break;
- case 125:
+ case 143:
/* Line 1455 of yacc.c */
-#line 1234 "program_parse.y"
+#line 1417 "program_parse.y"
{
(yyval.integer) = 0;
;}
break;
- case 126:
+ case 144:
/* Line 1455 of yacc.c */
-#line 1238 "program_parse.y"
+#line 1421 "program_parse.y"
{
if (((yyvsp[(1) - (1)].integer) < 1) || ((unsigned) (yyvsp[(1) - (1)].integer) >= state->limits->MaxParameters)) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid parameter array size");
@@ -3403,38 +3654,38 @@ yyreduce:
;}
break;
- case 127:
+ case 145:
/* Line 1455 of yacc.c */
-#line 1249 "program_parse.y"
+#line 1432 "program_parse.y"
{
(yyval.temp_sym) = (yyvsp[(2) - (2)].temp_sym);
;}
break;
- case 128:
+ case 146:
/* Line 1455 of yacc.c */
-#line 1255 "program_parse.y"
+#line 1438 "program_parse.y"
{
(yyval.temp_sym) = (yyvsp[(3) - (4)].temp_sym);
;}
break;
- case 130:
+ case 148:
/* Line 1455 of yacc.c */
-#line 1262 "program_parse.y"
+#line 1445 "program_parse.y"
{
(yyvsp[(1) - (3)].temp_sym).param_binding_length += (yyvsp[(3) - (3)].temp_sym).param_binding_length;
(yyval.temp_sym) = (yyvsp[(1) - (3)].temp_sym);
;}
break;
- case 131:
+ case 149:
/* Line 1455 of yacc.c */
-#line 1269 "program_parse.y"
+#line 1452 "program_parse.y"
{
memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));
(yyval.temp_sym).param_binding_begin = ~0;
@@ -3442,10 +3693,10 @@ yyreduce:
;}
break;
- case 132:
+ case 150:
/* Line 1455 of yacc.c */
-#line 1275 "program_parse.y"
+#line 1458 "program_parse.y"
{
memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));
(yyval.temp_sym).param_binding_begin = ~0;
@@ -3453,10 +3704,10 @@ yyreduce:
;}
break;
- case 133:
+ case 151:
/* Line 1455 of yacc.c */
-#line 1281 "program_parse.y"
+#line 1464 "program_parse.y"
{
memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));
(yyval.temp_sym).param_binding_begin = ~0;
@@ -3464,10 +3715,10 @@ yyreduce:
;}
break;
- case 134:
+ case 152:
/* Line 1455 of yacc.c */
-#line 1289 "program_parse.y"
+#line 1472 "program_parse.y"
{
memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));
(yyval.temp_sym).param_binding_begin = ~0;
@@ -3475,10 +3726,10 @@ yyreduce:
;}
break;
- case 135:
+ case 153:
/* Line 1455 of yacc.c */
-#line 1295 "program_parse.y"
+#line 1478 "program_parse.y"
{
memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));
(yyval.temp_sym).param_binding_begin = ~0;
@@ -3486,10 +3737,10 @@ yyreduce:
;}
break;
- case 136:
+ case 154:
/* Line 1455 of yacc.c */
-#line 1301 "program_parse.y"
+#line 1484 "program_parse.y"
{
memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));
(yyval.temp_sym).param_binding_begin = ~0;
@@ -3497,10 +3748,10 @@ yyreduce:
;}
break;
- case 137:
+ case 155:
/* Line 1455 of yacc.c */
-#line 1309 "program_parse.y"
+#line 1492 "program_parse.y"
{
memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));
(yyval.temp_sym).param_binding_begin = ~0;
@@ -3508,10 +3759,10 @@ yyreduce:
;}
break;
- case 138:
+ case 156:
/* Line 1455 of yacc.c */
-#line 1315 "program_parse.y"
+#line 1498 "program_parse.y"
{
memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));
(yyval.temp_sym).param_binding_begin = ~0;
@@ -3519,10 +3770,10 @@ yyreduce:
;}
break;
- case 139:
+ case 157:
/* Line 1455 of yacc.c */
-#line 1321 "program_parse.y"
+#line 1504 "program_parse.y"
{
memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));
(yyval.temp_sym).param_binding_begin = ~0;
@@ -3530,101 +3781,101 @@ yyreduce:
;}
break;
- case 140:
+ case 158:
/* Line 1455 of yacc.c */
-#line 1328 "program_parse.y"
+#line 1511 "program_parse.y"
{ memcpy((yyval.state), (yyvsp[(1) - (1)].state), sizeof((yyval.state))); ;}
break;
- case 141:
+ case 159:
/* Line 1455 of yacc.c */
-#line 1329 "program_parse.y"
+#line 1512 "program_parse.y"
{ memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
break;
- case 142:
+ case 160:
/* Line 1455 of yacc.c */
-#line 1332 "program_parse.y"
+#line 1515 "program_parse.y"
{ memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
break;
- case 143:
+ case 161:
/* Line 1455 of yacc.c */
-#line 1333 "program_parse.y"
+#line 1516 "program_parse.y"
{ memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
break;
- case 144:
+ case 162:
/* Line 1455 of yacc.c */
-#line 1334 "program_parse.y"
+#line 1517 "program_parse.y"
{ memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
break;
- case 145:
+ case 163:
/* Line 1455 of yacc.c */
-#line 1335 "program_parse.y"
+#line 1518 "program_parse.y"
{ memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
break;
- case 146:
+ case 164:
/* Line 1455 of yacc.c */
-#line 1336 "program_parse.y"
+#line 1519 "program_parse.y"
{ memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
break;
- case 147:
+ case 165:
/* Line 1455 of yacc.c */
-#line 1337 "program_parse.y"
+#line 1520 "program_parse.y"
{ memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
break;
- case 148:
+ case 166:
/* Line 1455 of yacc.c */
-#line 1338 "program_parse.y"
+#line 1521 "program_parse.y"
{ memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
break;
- case 149:
+ case 167:
/* Line 1455 of yacc.c */
-#line 1339 "program_parse.y"
+#line 1522 "program_parse.y"
{ memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
break;
- case 150:
+ case 168:
/* Line 1455 of yacc.c */
-#line 1340 "program_parse.y"
+#line 1523 "program_parse.y"
{ memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
break;
- case 151:
+ case 169:
/* Line 1455 of yacc.c */
-#line 1341 "program_parse.y"
+#line 1524 "program_parse.y"
{ memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
break;
- case 152:
+ case 170:
/* Line 1455 of yacc.c */
-#line 1342 "program_parse.y"
+#line 1525 "program_parse.y"
{ memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
break;
- case 153:
+ case 171:
/* Line 1455 of yacc.c */
-#line 1346 "program_parse.y"
+#line 1529 "program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = STATE_MATERIAL;
@@ -3633,37 +3884,37 @@ yyreduce:
;}
break;
- case 154:
+ case 172:
/* Line 1455 of yacc.c */
-#line 1355 "program_parse.y"
+#line 1538 "program_parse.y"
{
(yyval.integer) = (yyvsp[(1) - (1)].integer);
;}
break;
- case 155:
+ case 173:
/* Line 1455 of yacc.c */
-#line 1359 "program_parse.y"
+#line 1542 "program_parse.y"
{
(yyval.integer) = STATE_EMISSION;
;}
break;
- case 156:
+ case 174:
/* Line 1455 of yacc.c */
-#line 1363 "program_parse.y"
+#line 1546 "program_parse.y"
{
(yyval.integer) = STATE_SHININESS;
;}
break;
- case 157:
+ case 175:
/* Line 1455 of yacc.c */
-#line 1369 "program_parse.y"
+#line 1552 "program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = STATE_LIGHT;
@@ -3672,28 +3923,28 @@ yyreduce:
;}
break;
- case 158:
+ case 176:
/* Line 1455 of yacc.c */
-#line 1378 "program_parse.y"
+#line 1561 "program_parse.y"
{
(yyval.integer) = (yyvsp[(1) - (1)].integer);
;}
break;
- case 159:
+ case 177:
/* Line 1455 of yacc.c */
-#line 1382 "program_parse.y"
+#line 1565 "program_parse.y"
{
(yyval.integer) = STATE_POSITION;
;}
break;
- case 160:
+ case 178:
/* Line 1455 of yacc.c */
-#line 1386 "program_parse.y"
+#line 1569 "program_parse.y"
{
if (!state->ctx->Extensions.EXT_point_parameters) {
yyerror(& (yylsp[(1) - (1)]), state, "GL_ARB_point_parameters not supported");
@@ -3704,57 +3955,57 @@ yyreduce:
;}
break;
- case 161:
+ case 179:
/* Line 1455 of yacc.c */
-#line 1395 "program_parse.y"
+#line 1578 "program_parse.y"
{
(yyval.integer) = (yyvsp[(2) - (2)].integer);
;}
break;
- case 162:
+ case 180:
/* Line 1455 of yacc.c */
-#line 1399 "program_parse.y"
+#line 1582 "program_parse.y"
{
(yyval.integer) = STATE_HALF_VECTOR;
;}
break;
- case 163:
+ case 181:
/* Line 1455 of yacc.c */
-#line 1405 "program_parse.y"
+#line 1588 "program_parse.y"
{
(yyval.integer) = STATE_SPOT_DIRECTION;
;}
break;
- case 164:
+ case 182:
/* Line 1455 of yacc.c */
-#line 1411 "program_parse.y"
+#line 1594 "program_parse.y"
{
(yyval.state)[0] = (yyvsp[(2) - (2)].state)[0];
(yyval.state)[1] = (yyvsp[(2) - (2)].state)[1];
;}
break;
- case 165:
+ case 183:
/* Line 1455 of yacc.c */
-#line 1418 "program_parse.y"
+#line 1601 "program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = STATE_LIGHTMODEL_AMBIENT;
;}
break;
- case 166:
+ case 184:
/* Line 1455 of yacc.c */
-#line 1423 "program_parse.y"
+#line 1606 "program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = STATE_LIGHTMODEL_SCENECOLOR;
@@ -3762,10 +4013,10 @@ yyreduce:
;}
break;
- case 167:
+ case 185:
/* Line 1455 of yacc.c */
-#line 1431 "program_parse.y"
+#line 1614 "program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = STATE_LIGHTPROD;
@@ -3775,10 +4026,10 @@ yyreduce:
;}
break;
- case 169:
+ case 187:
/* Line 1455 of yacc.c */
-#line 1443 "program_parse.y"
+#line 1626 "program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = (yyvsp[(3) - (3)].integer);
@@ -3786,46 +4037,46 @@ yyreduce:
;}
break;
- case 170:
+ case 188:
/* Line 1455 of yacc.c */
-#line 1451 "program_parse.y"
+#line 1634 "program_parse.y"
{
(yyval.integer) = STATE_TEXENV_COLOR;
;}
break;
- case 171:
+ case 189:
/* Line 1455 of yacc.c */
-#line 1457 "program_parse.y"
+#line 1640 "program_parse.y"
{
(yyval.integer) = STATE_AMBIENT;
;}
break;
- case 172:
+ case 190:
/* Line 1455 of yacc.c */
-#line 1461 "program_parse.y"
+#line 1644 "program_parse.y"
{
(yyval.integer) = STATE_DIFFUSE;
;}
break;
- case 173:
+ case 191:
/* Line 1455 of yacc.c */
-#line 1465 "program_parse.y"
+#line 1648 "program_parse.y"
{
(yyval.integer) = STATE_SPECULAR;
;}
break;
- case 174:
+ case 192:
/* Line 1455 of yacc.c */
-#line 1471 "program_parse.y"
+#line 1654 "program_parse.y"
{
if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxLights) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid light selector");
@@ -3836,10 +4087,10 @@ yyreduce:
;}
break;
- case 175:
+ case 193:
/* Line 1455 of yacc.c */
-#line 1482 "program_parse.y"
+#line 1665 "program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = STATE_TEXGEN;
@@ -3848,92 +4099,92 @@ yyreduce:
;}
break;
- case 176:
+ case 194:
/* Line 1455 of yacc.c */
-#line 1491 "program_parse.y"
+#line 1674 "program_parse.y"
{
(yyval.integer) = STATE_TEXGEN_EYE_S;
;}
break;
- case 177:
+ case 195:
/* Line 1455 of yacc.c */
-#line 1495 "program_parse.y"
+#line 1678 "program_parse.y"
{
(yyval.integer) = STATE_TEXGEN_OBJECT_S;
;}
break;
- case 178:
+ case 196:
/* Line 1455 of yacc.c */
-#line 1500 "program_parse.y"
+#line 1683 "program_parse.y"
{
(yyval.integer) = STATE_TEXGEN_EYE_S - STATE_TEXGEN_EYE_S;
;}
break;
- case 179:
+ case 197:
/* Line 1455 of yacc.c */
-#line 1504 "program_parse.y"
+#line 1687 "program_parse.y"
{
(yyval.integer) = STATE_TEXGEN_EYE_T - STATE_TEXGEN_EYE_S;
;}
break;
- case 180:
+ case 198:
/* Line 1455 of yacc.c */
-#line 1508 "program_parse.y"
+#line 1691 "program_parse.y"
{
(yyval.integer) = STATE_TEXGEN_EYE_R - STATE_TEXGEN_EYE_S;
;}
break;
- case 181:
+ case 199:
/* Line 1455 of yacc.c */
-#line 1512 "program_parse.y"
+#line 1695 "program_parse.y"
{
(yyval.integer) = STATE_TEXGEN_EYE_Q - STATE_TEXGEN_EYE_S;
;}
break;
- case 182:
+ case 200:
/* Line 1455 of yacc.c */
-#line 1518 "program_parse.y"
+#line 1701 "program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = (yyvsp[(2) - (2)].integer);
;}
break;
- case 183:
+ case 201:
/* Line 1455 of yacc.c */
-#line 1525 "program_parse.y"
+#line 1708 "program_parse.y"
{
(yyval.integer) = STATE_FOG_COLOR;
;}
break;
- case 184:
+ case 202:
/* Line 1455 of yacc.c */
-#line 1529 "program_parse.y"
+#line 1712 "program_parse.y"
{
(yyval.integer) = STATE_FOG_PARAMS;
;}
break;
- case 185:
+ case 203:
/* Line 1455 of yacc.c */
-#line 1535 "program_parse.y"
+#line 1718 "program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = STATE_CLIPPLANE;
@@ -3941,10 +4192,10 @@ yyreduce:
;}
break;
- case 186:
+ case 204:
/* Line 1455 of yacc.c */
-#line 1543 "program_parse.y"
+#line 1726 "program_parse.y"
{
if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxClipPlanes) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid clip plane selector");
@@ -3955,38 +4206,38 @@ yyreduce:
;}
break;
- case 187:
+ case 205:
/* Line 1455 of yacc.c */
-#line 1554 "program_parse.y"
+#line 1737 "program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = (yyvsp[(2) - (2)].integer);
;}
break;
- case 188:
+ case 206:
/* Line 1455 of yacc.c */
-#line 1561 "program_parse.y"
+#line 1744 "program_parse.y"
{
(yyval.integer) = STATE_POINT_SIZE;
;}
break;
- case 189:
+ case 207:
/* Line 1455 of yacc.c */
-#line 1565 "program_parse.y"
+#line 1748 "program_parse.y"
{
(yyval.integer) = STATE_POINT_ATTENUATION;
;}
break;
- case 190:
+ case 208:
/* Line 1455 of yacc.c */
-#line 1571 "program_parse.y"
+#line 1754 "program_parse.y"
{
(yyval.state)[0] = (yyvsp[(1) - (5)].state)[0];
(yyval.state)[1] = (yyvsp[(1) - (5)].state)[1];
@@ -3996,10 +4247,10 @@ yyreduce:
;}
break;
- case 191:
+ case 209:
/* Line 1455 of yacc.c */
-#line 1581 "program_parse.y"
+#line 1764 "program_parse.y"
{
(yyval.state)[0] = (yyvsp[(1) - (2)].state)[0];
(yyval.state)[1] = (yyvsp[(1) - (2)].state)[1];
@@ -4009,20 +4260,20 @@ yyreduce:
;}
break;
- case 192:
+ case 210:
/* Line 1455 of yacc.c */
-#line 1591 "program_parse.y"
+#line 1774 "program_parse.y"
{
(yyval.state)[2] = 0;
(yyval.state)[3] = 3;
;}
break;
- case 193:
+ case 211:
/* Line 1455 of yacc.c */
-#line 1596 "program_parse.y"
+#line 1779 "program_parse.y"
{
/* It seems logical that the matrix row range specifier would have
* to specify a range or more than one row (i.e., $5 > $3).
@@ -4040,10 +4291,10 @@ yyreduce:
;}
break;
- case 194:
+ case 212:
/* Line 1455 of yacc.c */
-#line 1614 "program_parse.y"
+#line 1797 "program_parse.y"
{
(yyval.state)[0] = (yyvsp[(2) - (3)].state)[0];
(yyval.state)[1] = (yyvsp[(2) - (3)].state)[1];
@@ -4051,55 +4302,55 @@ yyreduce:
;}
break;
- case 195:
+ case 213:
/* Line 1455 of yacc.c */
-#line 1622 "program_parse.y"
+#line 1805 "program_parse.y"
{
(yyval.integer) = 0;
;}
break;
- case 196:
+ case 214:
/* Line 1455 of yacc.c */
-#line 1626 "program_parse.y"
+#line 1809 "program_parse.y"
{
(yyval.integer) = (yyvsp[(1) - (1)].integer);
;}
break;
- case 197:
+ case 215:
/* Line 1455 of yacc.c */
-#line 1632 "program_parse.y"
+#line 1815 "program_parse.y"
{
(yyval.integer) = STATE_MATRIX_INVERSE;
;}
break;
- case 198:
+ case 216:
/* Line 1455 of yacc.c */
-#line 1636 "program_parse.y"
+#line 1819 "program_parse.y"
{
(yyval.integer) = STATE_MATRIX_TRANSPOSE;
;}
break;
- case 199:
+ case 217:
/* Line 1455 of yacc.c */
-#line 1640 "program_parse.y"
+#line 1823 "program_parse.y"
{
(yyval.integer) = STATE_MATRIX_INVTRANS;
;}
break;
- case 200:
+ case 218:
/* Line 1455 of yacc.c */
-#line 1646 "program_parse.y"
+#line 1829 "program_parse.y"
{
if ((yyvsp[(1) - (1)].integer) > 3) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid matrix row reference");
@@ -4110,88 +4361,88 @@ yyreduce:
;}
break;
- case 201:
+ case 219:
/* Line 1455 of yacc.c */
-#line 1657 "program_parse.y"
+#line 1840 "program_parse.y"
{
(yyval.state)[0] = STATE_MODELVIEW_MATRIX;
(yyval.state)[1] = (yyvsp[(2) - (2)].integer);
;}
break;
- case 202:
+ case 220:
/* Line 1455 of yacc.c */
-#line 1662 "program_parse.y"
+#line 1845 "program_parse.y"
{
(yyval.state)[0] = STATE_PROJECTION_MATRIX;
(yyval.state)[1] = 0;
;}
break;
- case 203:
+ case 221:
/* Line 1455 of yacc.c */
-#line 1667 "program_parse.y"
+#line 1850 "program_parse.y"
{
(yyval.state)[0] = STATE_MVP_MATRIX;
(yyval.state)[1] = 0;
;}
break;
- case 204:
+ case 222:
/* Line 1455 of yacc.c */
-#line 1672 "program_parse.y"
+#line 1855 "program_parse.y"
{
(yyval.state)[0] = STATE_TEXTURE_MATRIX;
(yyval.state)[1] = (yyvsp[(2) - (2)].integer);
;}
break;
- case 205:
+ case 223:
/* Line 1455 of yacc.c */
-#line 1677 "program_parse.y"
+#line 1860 "program_parse.y"
{
yyerror(& (yylsp[(1) - (4)]), state, "GL_ARB_matrix_palette not supported");
YYERROR;
;}
break;
- case 206:
+ case 224:
/* Line 1455 of yacc.c */
-#line 1682 "program_parse.y"
+#line 1865 "program_parse.y"
{
(yyval.state)[0] = STATE_PROGRAM_MATRIX;
(yyval.state)[1] = (yyvsp[(3) - (4)].integer);
;}
break;
- case 207:
+ case 225:
/* Line 1455 of yacc.c */
-#line 1689 "program_parse.y"
+#line 1872 "program_parse.y"
{
(yyval.integer) = 0;
;}
break;
- case 208:
+ case 226:
/* Line 1455 of yacc.c */
-#line 1693 "program_parse.y"
+#line 1876 "program_parse.y"
{
(yyval.integer) = (yyvsp[(2) - (3)].integer);
;}
break;
- case 209:
+ case 227:
/* Line 1455 of yacc.c */
-#line 1698 "program_parse.y"
+#line 1881 "program_parse.y"
{
/* Since GL_ARB_vertex_blend isn't supported, only modelview matrix
* zero is valid.
@@ -4205,10 +4456,10 @@ yyreduce:
;}
break;
- case 210:
+ case 228:
/* Line 1455 of yacc.c */
-#line 1711 "program_parse.y"
+#line 1894 "program_parse.y"
{
/* Since GL_ARB_matrix_palette isn't supported, just let any value
* through here. The error will be generated later.
@@ -4217,10 +4468,10 @@ yyreduce:
;}
break;
- case 211:
+ case 229:
/* Line 1455 of yacc.c */
-#line 1719 "program_parse.y"
+#line 1902 "program_parse.y"
{
if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxProgramMatrices) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid program matrix selector");
@@ -4231,20 +4482,20 @@ yyreduce:
;}
break;
- case 212:
+ case 230:
/* Line 1455 of yacc.c */
-#line 1730 "program_parse.y"
+#line 1913 "program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = STATE_DEPTH_RANGE;
;}
break;
- case 217:
+ case 235:
/* Line 1455 of yacc.c */
-#line 1742 "program_parse.y"
+#line 1925 "program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = state->state_param_enum;
@@ -4254,30 +4505,30 @@ yyreduce:
;}
break;
- case 218:
+ case 236:
/* Line 1455 of yacc.c */
-#line 1752 "program_parse.y"
+#line 1935 "program_parse.y"
{
(yyval.state)[0] = (yyvsp[(1) - (1)].integer);
(yyval.state)[1] = (yyvsp[(1) - (1)].integer);
;}
break;
- case 219:
+ case 237:
/* Line 1455 of yacc.c */
-#line 1757 "program_parse.y"
+#line 1940 "program_parse.y"
{
(yyval.state)[0] = (yyvsp[(1) - (3)].integer);
(yyval.state)[1] = (yyvsp[(3) - (3)].integer);
;}
break;
- case 220:
+ case 238:
/* Line 1455 of yacc.c */
-#line 1764 "program_parse.y"
+#line 1947 "program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = state->state_param_enum;
@@ -4287,10 +4538,10 @@ yyreduce:
;}
break;
- case 221:
+ case 239:
/* Line 1455 of yacc.c */
-#line 1774 "program_parse.y"
+#line 1957 "program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = state->state_param_enum;
@@ -4300,30 +4551,30 @@ yyreduce:
;}
break;
- case 222:
+ case 240:
/* Line 1455 of yacc.c */
-#line 1783 "program_parse.y"
+#line 1966 "program_parse.y"
{
(yyval.state)[0] = (yyvsp[(1) - (1)].integer);
(yyval.state)[1] = (yyvsp[(1) - (1)].integer);
;}
break;
- case 223:
+ case 241:
/* Line 1455 of yacc.c */
-#line 1788 "program_parse.y"
+#line 1971 "program_parse.y"
{
(yyval.state)[0] = (yyvsp[(1) - (3)].integer);
(yyval.state)[1] = (yyvsp[(3) - (3)].integer);
;}
break;
- case 224:
+ case 242:
/* Line 1455 of yacc.c */
-#line 1795 "program_parse.y"
+#line 1978 "program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = state->state_param_enum;
@@ -4333,10 +4584,10 @@ yyreduce:
;}
break;
- case 225:
+ case 243:
/* Line 1455 of yacc.c */
-#line 1805 "program_parse.y"
+#line 1988 "program_parse.y"
{
if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->limits->MaxEnvParams) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid environment parameter reference");
@@ -4346,10 +4597,10 @@ yyreduce:
;}
break;
- case 226:
+ case 244:
/* Line 1455 of yacc.c */
-#line 1815 "program_parse.y"
+#line 1998 "program_parse.y"
{
if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->limits->MaxLocalParams) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid local parameter reference");
@@ -4359,10 +4610,10 @@ yyreduce:
;}
break;
- case 231:
+ case 249:
/* Line 1455 of yacc.c */
-#line 1830 "program_parse.y"
+#line 2013 "program_parse.y"
{
(yyval.vector).count = 4;
(yyval.vector).data[0] = (yyvsp[(1) - (1)].real);
@@ -4372,10 +4623,10 @@ yyreduce:
;}
break;
- case 232:
+ case 250:
/* Line 1455 of yacc.c */
-#line 1840 "program_parse.y"
+#line 2023 "program_parse.y"
{
(yyval.vector).count = 1;
(yyval.vector).data[0] = (yyvsp[(1) - (1)].real);
@@ -4385,10 +4636,10 @@ yyreduce:
;}
break;
- case 233:
+ case 251:
/* Line 1455 of yacc.c */
-#line 1848 "program_parse.y"
+#line 2031 "program_parse.y"
{
(yyval.vector).count = 1;
(yyval.vector).data[0] = (float) (yyvsp[(1) - (1)].integer);
@@ -4398,10 +4649,10 @@ yyreduce:
;}
break;
- case 234:
+ case 252:
/* Line 1455 of yacc.c */
-#line 1858 "program_parse.y"
+#line 2041 "program_parse.y"
{
(yyval.vector).count = 4;
(yyval.vector).data[0] = (yyvsp[(2) - (3)].real);
@@ -4411,10 +4662,10 @@ yyreduce:
;}
break;
- case 235:
+ case 253:
/* Line 1455 of yacc.c */
-#line 1866 "program_parse.y"
+#line 2049 "program_parse.y"
{
(yyval.vector).count = 4;
(yyval.vector).data[0] = (yyvsp[(2) - (5)].real);
@@ -4424,10 +4675,10 @@ yyreduce:
;}
break;
- case 236:
+ case 254:
/* Line 1455 of yacc.c */
-#line 1875 "program_parse.y"
+#line 2058 "program_parse.y"
{
(yyval.vector).count = 4;
(yyval.vector).data[0] = (yyvsp[(2) - (7)].real);
@@ -4437,10 +4688,10 @@ yyreduce:
;}
break;
- case 237:
+ case 255:
/* Line 1455 of yacc.c */
-#line 1884 "program_parse.y"
+#line 2067 "program_parse.y"
{
(yyval.vector).count = 4;
(yyval.vector).data[0] = (yyvsp[(2) - (9)].real);
@@ -4450,56 +4701,56 @@ yyreduce:
;}
break;
- case 238:
+ case 256:
/* Line 1455 of yacc.c */
-#line 1894 "program_parse.y"
+#line 2077 "program_parse.y"
{
(yyval.real) = ((yyvsp[(1) - (2)].negate)) ? -(yyvsp[(2) - (2)].real) : (yyvsp[(2) - (2)].real);
;}
break;
- case 239:
+ case 257:
/* Line 1455 of yacc.c */
-#line 1898 "program_parse.y"
+#line 2081 "program_parse.y"
{
(yyval.real) = (float)(((yyvsp[(1) - (2)].negate)) ? -(yyvsp[(2) - (2)].integer) : (yyvsp[(2) - (2)].integer));
;}
break;
- case 240:
+ case 258:
/* Line 1455 of yacc.c */
-#line 1903 "program_parse.y"
+#line 2086 "program_parse.y"
{ (yyval.negate) = FALSE; ;}
break;
- case 241:
+ case 259:
/* Line 1455 of yacc.c */
-#line 1904 "program_parse.y"
+#line 2087 "program_parse.y"
{ (yyval.negate) = TRUE; ;}
break;
- case 242:
+ case 260:
/* Line 1455 of yacc.c */
-#line 1905 "program_parse.y"
+#line 2088 "program_parse.y"
{ (yyval.negate) = FALSE; ;}
break;
- case 243:
+ case 261:
/* Line 1455 of yacc.c */
-#line 1908 "program_parse.y"
+#line 2091 "program_parse.y"
{ (yyval.integer) = (yyvsp[(2) - (2)].integer); ;}
break;
- case 245:
+ case 263:
/* Line 1455 of yacc.c */
-#line 1912 "program_parse.y"
+#line 2095 "program_parse.y"
{
/* NV_fragment_program_option defines the size qualifiers in a
* fairly broken way. "SHORT" or "LONG" can optionally be used
@@ -4535,25 +4786,25 @@ yyreduce:
;}
break;
- case 246:
+ case 264:
/* Line 1455 of yacc.c */
-#line 1946 "program_parse.y"
+#line 2129 "program_parse.y"
{
;}
break;
- case 247:
+ case 265:
/* Line 1455 of yacc.c */
-#line 1950 "program_parse.y"
+#line 2133 "program_parse.y"
{ (yyval.integer) = (yyvsp[(1) - (1)].integer); ;}
break;
- case 249:
+ case 267:
/* Line 1455 of yacc.c */
-#line 1954 "program_parse.y"
+#line 2137 "program_parse.y"
{
if (!declare_variable(state, (yyvsp[(3) - (3)].string), (yyvsp[(0) - (3)].integer), & (yylsp[(3) - (3)]))) {
YYERROR;
@@ -4561,10 +4812,10 @@ yyreduce:
;}
break;
- case 250:
+ case 268:
/* Line 1455 of yacc.c */
-#line 1960 "program_parse.y"
+#line 2143 "program_parse.y"
{
if (!declare_variable(state, (yyvsp[(1) - (1)].string), (yyvsp[(0) - (1)].integer), & (yylsp[(1) - (1)]))) {
YYERROR;
@@ -4572,10 +4823,10 @@ yyreduce:
;}
break;
- case 251:
+ case 269:
/* Line 1455 of yacc.c */
-#line 1968 "program_parse.y"
+#line 2151 "program_parse.y"
{
struct asm_symbol *const s =
declare_variable(state, (yyvsp[(3) - (5)].string), at_output, & (yylsp[(3) - (5)]));
@@ -4583,15 +4834,15 @@ yyreduce:
if (s == NULL) {
YYERROR;
} else {
- s->output_binding = (yyvsp[(5) - (5)].result);
+ s->binding = (yyvsp[(5) - (5)].result);
}
;}
break;
- case 252:
+ case 270:
/* Line 1455 of yacc.c */
-#line 1981 "program_parse.y"
+#line 2164 "program_parse.y"
{
if (state->mode == ARB_vertex) {
(yyval.result) = VERT_RESULT_HPOS;
@@ -4602,10 +4853,10 @@ yyreduce:
;}
break;
- case 253:
+ case 271:
/* Line 1455 of yacc.c */
-#line 1990 "program_parse.y"
+#line 2173 "program_parse.y"
{
if (state->mode == ARB_vertex) {
(yyval.result) = VERT_RESULT_FOGC;
@@ -4616,19 +4867,19 @@ yyreduce:
;}
break;
- case 254:
+ case 272:
/* Line 1455 of yacc.c */
-#line 1999 "program_parse.y"
+#line 2182 "program_parse.y"
{
(yyval.result) = (yyvsp[(2) - (2)].result);
;}
break;
- case 255:
+ case 273:
/* Line 1455 of yacc.c */
-#line 2003 "program_parse.y"
+#line 2186 "program_parse.y"
{
if (state->mode == ARB_vertex) {
(yyval.result) = VERT_RESULT_PSIZ;
@@ -4639,10 +4890,10 @@ yyreduce:
;}
break;
- case 256:
+ case 274:
/* Line 1455 of yacc.c */
-#line 2012 "program_parse.y"
+#line 2195 "program_parse.y"
{
if (state->mode == ARB_vertex) {
(yyval.result) = VERT_RESULT_TEX0 + (yyvsp[(3) - (3)].integer);
@@ -4653,10 +4904,10 @@ yyreduce:
;}
break;
- case 257:
+ case 275:
/* Line 1455 of yacc.c */
-#line 2021 "program_parse.y"
+#line 2204 "program_parse.y"
{
if (state->mode == ARB_fragment) {
(yyval.result) = FRAG_RESULT_DEPTH;
@@ -4667,19 +4918,29 @@ yyreduce:
;}
break;
- case 258:
+ case 276:
+
+/* Line 1455 of yacc.c */
+#line 2213 "program_parse.y"
+ {
+ yyerror(& (yylsp[(2) - (5)]), state, "user clip planes not yet supported");
+ YYERROR;
+ ;}
+ break;
+
+ case 277:
/* Line 1455 of yacc.c */
-#line 2032 "program_parse.y"
+#line 2220 "program_parse.y"
{
(yyval.result) = (yyvsp[(2) - (3)].integer) + (yyvsp[(3) - (3)].integer);
;}
break;
- case 259:
+ case 278:
/* Line 1455 of yacc.c */
-#line 2038 "program_parse.y"
+#line 2226 "program_parse.y"
{
(yyval.integer) = (state->mode == ARB_vertex)
? VERT_RESULT_COL0
@@ -4687,10 +4948,10 @@ yyreduce:
;}
break;
- case 260:
+ case 279:
/* Line 1455 of yacc.c */
-#line 2044 "program_parse.y"
+#line 2232 "program_parse.y"
{
if (state->mode == ARB_vertex) {
(yyval.integer) = VERT_RESULT_COL0;
@@ -4701,10 +4962,10 @@ yyreduce:
;}
break;
- case 261:
+ case 280:
/* Line 1455 of yacc.c */
-#line 2053 "program_parse.y"
+#line 2241 "program_parse.y"
{
if (state->mode == ARB_vertex) {
(yyval.integer) = VERT_RESULT_BFC0;
@@ -4715,19 +4976,19 @@ yyreduce:
;}
break;
- case 262:
+ case 281:
/* Line 1455 of yacc.c */
-#line 2064 "program_parse.y"
+#line 2252 "program_parse.y"
{
(yyval.integer) = 0;
;}
break;
- case 263:
+ case 282:
/* Line 1455 of yacc.c */
-#line 2068 "program_parse.y"
+#line 2256 "program_parse.y"
{
if (state->mode == ARB_vertex) {
(yyval.integer) = 0;
@@ -4738,10 +4999,10 @@ yyreduce:
;}
break;
- case 264:
+ case 283:
/* Line 1455 of yacc.c */
-#line 2077 "program_parse.y"
+#line 2265 "program_parse.y"
{
if (state->mode == ARB_vertex) {
(yyval.integer) = 1;
@@ -4752,94 +5013,94 @@ yyreduce:
;}
break;
- case 265:
+ case 284:
/* Line 1455 of yacc.c */
-#line 2087 "program_parse.y"
+#line 2275 "program_parse.y"
{ (yyval.integer) = 0; ;}
break;
- case 266:
+ case 285:
/* Line 1455 of yacc.c */
-#line 2088 "program_parse.y"
+#line 2276 "program_parse.y"
{ (yyval.integer) = 0; ;}
break;
- case 267:
+ case 286:
/* Line 1455 of yacc.c */
-#line 2089 "program_parse.y"
+#line 2277 "program_parse.y"
{ (yyval.integer) = 1; ;}
break;
- case 268:
+ case 287:
/* Line 1455 of yacc.c */
-#line 2092 "program_parse.y"
+#line 2280 "program_parse.y"
{ (yyval.integer) = 0; ;}
break;
- case 269:
+ case 288:
/* Line 1455 of yacc.c */
-#line 2093 "program_parse.y"
+#line 2281 "program_parse.y"
{ (yyval.integer) = 0; ;}
break;
- case 270:
+ case 289:
/* Line 1455 of yacc.c */
-#line 2094 "program_parse.y"
+#line 2282 "program_parse.y"
{ (yyval.integer) = 1; ;}
break;
- case 271:
+ case 290:
/* Line 1455 of yacc.c */
-#line 2097 "program_parse.y"
+#line 2285 "program_parse.y"
{ (yyval.integer) = 0; ;}
break;
- case 272:
+ case 291:
/* Line 1455 of yacc.c */
-#line 2098 "program_parse.y"
+#line 2286 "program_parse.y"
{ (yyval.integer) = (yyvsp[(2) - (3)].integer); ;}
break;
- case 273:
+ case 292:
/* Line 1455 of yacc.c */
-#line 2101 "program_parse.y"
+#line 2289 "program_parse.y"
{ (yyval.integer) = 0; ;}
break;
- case 274:
+ case 293:
/* Line 1455 of yacc.c */
-#line 2102 "program_parse.y"
+#line 2290 "program_parse.y"
{ (yyval.integer) = (yyvsp[(2) - (3)].integer); ;}
break;
- case 275:
+ case 294:
/* Line 1455 of yacc.c */
-#line 2105 "program_parse.y"
+#line 2293 "program_parse.y"
{ (yyval.integer) = 0; ;}
break;
- case 276:
+ case 295:
/* Line 1455 of yacc.c */
-#line 2106 "program_parse.y"
+#line 2294 "program_parse.y"
{ (yyval.integer) = (yyvsp[(2) - (3)].integer); ;}
break;
- case 277:
+ case 296:
/* Line 1455 of yacc.c */
-#line 2110 "program_parse.y"
+#line 2298 "program_parse.y"
{
if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxTextureCoordUnits) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid texture coordinate unit selector");
@@ -4850,10 +5111,10 @@ yyreduce:
;}
break;
- case 278:
+ case 297:
/* Line 1455 of yacc.c */
-#line 2121 "program_parse.y"
+#line 2309 "program_parse.y"
{
if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxTextureImageUnits) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid texture image unit selector");
@@ -4864,10 +5125,10 @@ yyreduce:
;}
break;
- case 279:
+ case 298:
/* Line 1455 of yacc.c */
-#line 2132 "program_parse.y"
+#line 2320 "program_parse.y"
{
if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxTextureUnits) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid texture unit selector");
@@ -4878,10 +5139,10 @@ yyreduce:
;}
break;
- case 280:
+ case 299:
/* Line 1455 of yacc.c */
-#line 2143 "program_parse.y"
+#line 2331 "program_parse.y"
{
struct asm_symbol *exist = (struct asm_symbol *)
_mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(2) - (4)].string));
@@ -4905,7 +5166,7 @@ yyreduce:
/* Line 1455 of yacc.c */
-#line 4909 "program_parse.tab.c"
+#line 5170 "program_parse.tab.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -5124,7 +5385,7 @@ yyreturn:
/* Line 1675 of yacc.c */
-#line 2167 "program_parse.y"
+#line 2355 "program_parse.y"
void
@@ -5134,8 +5395,14 @@ asm_instruction_set_operands(struct asm_instruction *inst,
const struct asm_src_register *src1,
const struct asm_src_register *src2)
{
- /* In the core ARB extensions only the KIL instruction doesn't have a
- * destination register.
+ /* In the extensions supported by this assembler, the following instructions
+ * do not have destination registers:
+ *
+ * KIL (GL_ARB_fragment_program and GL_NV_fragment_program_option)
+ * BRA (GL_NV_vertex_program2_option)
+ * CAL (GL_NV_vertex_program2_option)
+ * RET (GL_NV_vertex_program2_option)
+ * PUSHA (GL_NV_vertex_program3)
*/
if (dst == NULL) {
init_dst_reg(& inst->Base.DstReg);
@@ -5143,8 +5410,14 @@ asm_instruction_set_operands(struct asm_instruction *inst,
inst->Base.DstReg = *dst;
}
- /* The only instruction that doesn't have any source registers is the
- * condition-code based KIL instruction added by NV_fragment_program_option.
+ /* In the extensions supported by this assembler, the following instructions
+ * do not have any source registers:
+ *
+ * KIL (GL_NV_fragment_program_option)
+ * BRA (GL_NV_vertex_program2_option)
+ * CAL (GL_NV_vertex_program2_option)
+ * RET (GL_NV_vertex_program2_option)
+ * POPA (GL_NV_vertex_program3)
*/
if (src0 != NULL) {
inst->Base.SrcReg[0] = src0->Base;
@@ -5282,7 +5555,7 @@ declare_variable(struct asm_parser_state *state, char *name, enum asm_type t,
return NULL;
}
- s->temp_binding = state->prog->NumTemporaries;
+ s->binding = state->prog->NumTemporaries;
state->prog->NumTemporaries++;
break;
@@ -5293,8 +5566,7 @@ declare_variable(struct asm_parser_state *state, char *name, enum asm_type t,
return NULL;
}
- /* FINISHME: Add support for multiple address registers.
- */
+ s->binding = state->prog->NumAddressRegs;
state->prog->NumAddressRegs++;
break;
@@ -5506,6 +5778,7 @@ _mesa_parse_arb_program(GLcontext *ctx, GLenum target, const GLubyte *str,
GLboolean result = GL_FALSE;
void *temp;
struct asm_symbol *sym;
+ unsigned main_offset;
state->ctx = ctx;
state->prog->Target = target;
@@ -5562,7 +5835,59 @@ _mesa_parse_arb_program(GLcontext *ctx, GLenum target, const GLubyte *str,
}
-
+ /* Search the instruction stream for BRA and CAL opcodes. Attempt to
+ * resolve the branch targets.
+ */
+ for (inst = state->inst_head; inst != NULL; inst = inst->next) {
+ if ((inst->Base.Opcode == OPCODE_CAL)
+ || (inst->Base.Opcode == OPCODE_BRA)) {
+ const char *const label = inst->Base.Data;
+ unsigned offset;
+
+ offset = (unsigned) (intptr_t)
+ _mesa_symbol_table_find_symbol(state->st, 1, label);
+ if (offset == 0) {
+ yyerror(& inst->position, state, "invalid branch target");
+ goto error;
+ } else {
+ inst->Base.BranchTarget = offset - 1;
+ }
+ }
+ }
+
+ /* If either there is no "main" label (offset of zero) or the "main" label
+ * is at the first instruction of the shader, do nothing. Otherwise
+ * prepend an unconditional branch to the main label. This also means that
+ * all branch targets need to be incremented by one instruction.
+ */
+ main_offset = (unsigned) (intptr_t)
+ _mesa_symbol_table_find_symbol(state->st, 1, "main");
+ if (main_offset > 1) {
+ struct asm_instruction *bra_to_main =
+ asm_instruction_ctor(OPCODE_BRA, NULL, NULL, NULL, NULL);
+
+ /* The -1 handles the biasing on the stored offset, and the +1 handles
+ * the offset caused by inserting a new instruction.
+ */
+ bra_to_main->Base.BranchTarget = main_offset - 1 + 1;
+
+ /* Insert the instruction in the list.
+ */
+ bra_to_main->next = state->inst_head;
+ state->inst_head = bra_to_main;
+ state->prog->NumInstructions++;
+
+ /* Bump the offsets of all other branch instructions.
+ */
+ for (inst = bra_to_main->next; inst != NULL; inst = inst->next) {
+ if ((inst->Base.Opcode == OPCODE_CAL)
+ || (inst->Base.Opcode == OPCODE_BRA)) {
+ inst->Base.BranchTarget++;
+ }
+ }
+ }
+
+
/* Add one instruction to store the "END" instruction.
*/
state->prog->Instructions =
diff --git a/src/mesa/shader/program_parse.tab.h b/src/mesa/shader/program_parse.tab.h
index 860b6f886e..28258d511c 100644
--- a/src/mesa/shader/program_parse.tab.h
+++ b/src/mesa/shader/program_parse.tab.h
@@ -55,95 +55,101 @@
SCALAR_OP = 271,
TRI_OP = 272,
VECTOR_OP = 273,
- ARL = 274,
- KIL = 275,
- SWZ = 276,
- TXD_OP = 277,
- INTEGER = 278,
- REAL = 279,
- AMBIENT = 280,
- ATTENUATION = 281,
- BACK = 282,
- CLIP = 283,
- COLOR = 284,
- DEPTH = 285,
- DIFFUSE = 286,
- DIRECTION = 287,
- EMISSION = 288,
- ENV = 289,
- EYE = 290,
- FOG = 291,
- FOGCOORD = 292,
- FRAGMENT = 293,
- FRONT = 294,
- HALF = 295,
- INVERSE = 296,
- INVTRANS = 297,
- LIGHT = 298,
- LIGHTMODEL = 299,
- LIGHTPROD = 300,
- LOCAL = 301,
- MATERIAL = 302,
- MAT_PROGRAM = 303,
- MATRIX = 304,
- MATRIXINDEX = 305,
- MODELVIEW = 306,
- MVP = 307,
- NORMAL = 308,
- OBJECT = 309,
- PALETTE = 310,
- PARAMS = 311,
- PLANE = 312,
- POINT_TOK = 313,
- POINTSIZE = 314,
- POSITION = 315,
- PRIMARY = 316,
- PROGRAM = 317,
- PROJECTION = 318,
- RANGE = 319,
- RESULT = 320,
- ROW = 321,
- SCENECOLOR = 322,
- SECONDARY = 323,
- SHININESS = 324,
- SIZE_TOK = 325,
- SPECULAR = 326,
- SPOT = 327,
- STATE = 328,
- TEXCOORD = 329,
- TEXENV = 330,
- TEXGEN = 331,
- TEXGEN_Q = 332,
- TEXGEN_R = 333,
- TEXGEN_S = 334,
- TEXGEN_T = 335,
- TEXTURE = 336,
- TRANSPOSE = 337,
- TEXTURE_UNIT = 338,
- TEX_1D = 339,
- TEX_2D = 340,
- TEX_3D = 341,
- TEX_CUBE = 342,
- TEX_RECT = 343,
- TEX_SHADOW1D = 344,
- TEX_SHADOW2D = 345,
- TEX_SHADOWRECT = 346,
- TEX_ARRAY1D = 347,
- TEX_ARRAY2D = 348,
- TEX_ARRAYSHADOW1D = 349,
- TEX_ARRAYSHADOW2D = 350,
- VERTEX = 351,
- VTXATTRIB = 352,
- WEIGHT = 353,
- IDENTIFIER = 354,
- USED_IDENTIFIER = 355,
- MASK4 = 356,
- MASK3 = 357,
- MASK2 = 358,
- MASK1 = 359,
- SWIZZLE = 360,
- DOT_DOT = 361,
- DOT = 362
+ KIL = 274,
+ SWZ = 275,
+ TXD_OP = 276,
+ BRA_OP = 277,
+ FLOW_OP = 278,
+ ARL_OP = 279,
+ ARL_NV_OP = 280,
+ ARA_OP = 281,
+ PUSHA_OP = 282,
+ POPA_OP = 283,
+ INTEGER = 284,
+ REAL = 285,
+ AMBIENT = 286,
+ ATTENUATION = 287,
+ BACK = 288,
+ CLIP = 289,
+ COLOR = 290,
+ DEPTH = 291,
+ DIFFUSE = 292,
+ DIRECTION = 293,
+ EMISSION = 294,
+ ENV = 295,
+ EYE = 296,
+ FOG = 297,
+ FOGCOORD = 298,
+ FRAGMENT = 299,
+ FRONT = 300,
+ HALF = 301,
+ INVERSE = 302,
+ INVTRANS = 303,
+ LIGHT = 304,
+ LIGHTMODEL = 305,
+ LIGHTPROD = 306,
+ LOCAL = 307,
+ MATERIAL = 308,
+ MAT_PROGRAM = 309,
+ MATRIX = 310,
+ MATRIXINDEX = 311,
+ MODELVIEW = 312,
+ MVP = 313,
+ NORMAL = 314,
+ OBJECT = 315,
+ PALETTE = 316,
+ PARAMS = 317,
+ PLANE = 318,
+ POINT_TOK = 319,
+ POINTSIZE = 320,
+ POSITION = 321,
+ PRIMARY = 322,
+ PROGRAM = 323,
+ PROJECTION = 324,
+ RANGE = 325,
+ RESULT = 326,
+ ROW = 327,
+ SCENECOLOR = 328,
+ SECONDARY = 329,
+ SHININESS = 330,
+ SIZE_TOK = 331,
+ SPECULAR = 332,
+ SPOT = 333,
+ STATE = 334,
+ TEXCOORD = 335,
+ TEXENV = 336,
+ TEXGEN = 337,
+ TEXGEN_Q = 338,
+ TEXGEN_R = 339,
+ TEXGEN_S = 340,
+ TEXGEN_T = 341,
+ TEXTURE = 342,
+ TRANSPOSE = 343,
+ TEXTURE_UNIT = 344,
+ TEX_1D = 345,
+ TEX_2D = 346,
+ TEX_3D = 347,
+ TEX_CUBE = 348,
+ TEX_RECT = 349,
+ TEX_SHADOW1D = 350,
+ TEX_SHADOW2D = 351,
+ TEX_SHADOWRECT = 352,
+ TEX_ARRAY1D = 353,
+ TEX_ARRAY2D = 354,
+ TEX_ARRAYSHADOW1D = 355,
+ TEX_ARRAYSHADOW2D = 356,
+ VERTEX = 357,
+ VTXATTRIB = 358,
+ WEIGHT = 359,
+ IDENTIFIER = 360,
+ USED_IDENTIFIER = 361,
+ MASK4 = 362,
+ MASK3 = 363,
+ MASK2 = 364,
+ MASK1 = 365,
+ SWIZZLE = 366,
+ DOT_DOT = 367,
+ DOT = 368
};
#endif
@@ -154,7 +160,7 @@ typedef union YYSTYPE
{
/* Line 1676 of yacc.c */
-#line 116 "program_parse.y"
+#line 121 "program_parse.y"
struct asm_instruction *inst;
struct asm_symbol *sym;
@@ -183,7 +189,7 @@ typedef union YYSTYPE
/* Line 1676 of yacc.c */
-#line 187 "program_parse.tab.h"
+#line 193 "program_parse.tab.h"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
diff --git a/src/mesa/shader/program_parse.y b/src/mesa/shader/program_parse.y
index 9703e8e670..79a5bc9f3c 100644
--- a/src/mesa/shader/program_parse.y
+++ b/src/mesa/shader/program_parse.y
@@ -105,6 +105,11 @@ static struct asm_instruction *asm_instruction_copy_ctor(
} while(YYID(0))
#define YYLEX_PARAM state->scanner
+
+#define SWIZZLE_XXXX MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_X, SWIZZLE_X, SWIZZLE_X)
+#define SWIZZLE_YYYY MAKE_SWIZZLE4(SWIZZLE_Y, SWIZZLE_Y, SWIZZLE_Y, SWIZZLE_Y)
+#define SWIZZLE_ZZZZ MAKE_SWIZZLE4(SWIZZLE_Z, SWIZZLE_Z, SWIZZLE_Z, SWIZZLE_Z)
+#define SWIZZLE_WWWW MAKE_SWIZZLE4(SWIZZLE_W, SWIZZLE_W, SWIZZLE_W, SWIZZLE_W)
%}
%pure-parser
@@ -151,7 +156,8 @@ static struct asm_instruction *asm_instruction_copy_ctor(
/* Tokens for instructions */
%token <temp_inst> BIN_OP BINSC_OP SAMPLE_OP SCALAR_OP TRI_OP VECTOR_OP
-%token <temp_inst> ARL KIL SWZ TXD_OP
+%token <temp_inst> KIL SWZ TXD_OP BRA_OP FLOW_OP
+%token <temp_inst> ARL_OP ARL_NV_OP ARA_OP PUSHA_OP POPA_OP
%token <integer> INTEGER
%token <real> REAL
@@ -179,19 +185,21 @@ static struct asm_instruction *asm_instruction_copy_ctor(
%token WEIGHT
%token <string> IDENTIFIER USED_IDENTIFIER
-%type <string> string
+%type <string> string labelName
%token <swiz_mask> MASK4 MASK3 MASK2 MASK1 SWIZZLE
%token DOT_DOT
%token DOT
-%type <inst> instruction ALU_instruction TexInstruction
+%type <inst> instruction ALU_instruction TexInstruction FlowInstruction
%type <inst> ARL_instruction VECTORop_instruction
%type <inst> SCALARop_instruction BINSCop_instruction BINop_instruction
%type <inst> TRIop_instruction TXD_instruction SWZ_instruction SAMPLE_instruction
-%type <inst> KIL_instruction
+%type <inst> KIL_instruction ARA_instruction BRA_instruction FLOWCC_instruction
+%type <inst> ASTACK_instruction
-%type <dst_reg> dstReg maskedDstReg maskedAddrReg
+%type <dst_reg> dstReg maskedDstReg instResultAddr
%type <src_reg> srcReg scalarUse scalarSrcReg swizzleSrcReg
+%type <src_reg> instOperandAddrVNS addrUseVNS
%type <swiz_mask> scalarSuffix swizzleSuffix extendedSwizzle
%type <ext_swizzle> extSwizComp extSwizSel
%type <swiz_mask> optionalMask
@@ -200,7 +208,7 @@ static struct asm_instruction *asm_instruction_copy_ctor(
%type <integer> addrRegRelOffset addrRegPosOffset addrRegNegOffset
%type <src_reg> progParamArrayMem progParamArrayAbs progParamArrayRel
%type <sym> addrReg
-%type <swiz_mask> addrComponent addrWriteMask
+%type <integer> addrComponent
%type <dst_reg> ccMaskRule ccTest ccMaskRule2 ccTest2 optionalCcMask
@@ -334,6 +342,7 @@ statement: instruction ';'
}
}
| namingStatement ';'
+ | labelStatement ':'
;
instruction: ALU_instruction
@@ -346,9 +355,12 @@ instruction: ALU_instruction
$$ = $1;
state->prog->NumTexInstructions++;
}
+ | FlowInstruction
;
-ALU_instruction: ARL_instruction
+ALU_instruction: ARA_instruction
+ | ARL_instruction
+ | ASTACK_instruction
| VECTORop_instruction
| SCALARop_instruction
| BINSCop_instruction
@@ -362,12 +374,48 @@ TexInstruction: SAMPLE_instruction
| TXD_instruction
;
-ARL_instruction: ARL maskedAddrReg ',' scalarSrcReg
+FlowInstruction: BRA_instruction
+ | FLOWCC_instruction
+ ;
+
+ /* ARL_OP is returned by the lexer for the input "ARL" in
+ * GL_ARB_vertex_program mode. In GL_NV_vertex_program2_option mode
+ * the lexer returns ARL_NV_OP for the same string. This allows the
+ * parser to differentiate between the different source opperand types
+ * for the two flavors of the instruction.
+ */
+ARL_instruction: ARL_OP instResultAddr ',' scalarSrcReg
+ {
+ $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, NULL, NULL);
+ }
+ | ARL_NV_OP instResultAddr ',' swizzleSrcReg
+ {
+ $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, NULL, NULL);
+ }
+ ;
+
+ARA_instruction: ARA_OP instResultAddr ',' instOperandAddrVNS
{
- $$ = asm_instruction_ctor(OPCODE_ARL, & $2, & $4, NULL, NULL);
+ $$ = asm_instruction_ctor(OPCODE_ARA, & $2, & $4, NULL, NULL);
}
;
+ASTACK_instruction: PUSHA_OP instOperandAddrVNS
+ {
+ $$ = asm_instruction_copy_ctor(& $1, NULL, & $2, NULL, NULL);
+ }
+ | POPA_OP instResultAddr
+ {
+ if ($2.WriteMask != WRITEMASK_XYZW) {
+ yyerror(& @2, state, "POPA only supports .xyzw write mask");
+ YYERROR;
+ }
+
+ $$ = asm_instruction_copy_ctor(& $1, & $2, NULL, NULL, NULL);
+ }
+ ;
+
+
VECTORop_instruction: VECTOR_OP maskedDstReg ',' swizzleSrcReg
{
$$ = asm_instruction_copy_ctor(& $1, & $2, & $4, NULL, NULL);
@@ -507,6 +555,21 @@ texImageUnit: TEXTURE_UNIT optTexImageUnitNum
{
$$ = $2;
}
+ | string optTexImageUnitNum
+ {
+ /* The NV_vertex_program3 spec is just plain broken. While
+ * ARB_fragment_program correctly makes "texture" a reserved word,
+ * NV_vp3 does not. To work around this, the lexer treats it as
+ * IDENTIFIER or USED_IDENTIFIER, and the parser has to do the
+ * matching.
+ */
+ if (strcmp("texture", $1) == 0) {
+ $$ = $2;
+ } else {
+ yyerror(& @1, state, "expected \"texture\", got IDENTIFIER");
+ YYERROR;
+ }
+ }
;
texTarget: TEX_1D { $$ = TEXTURE_1D_INDEX; }
@@ -521,6 +584,44 @@ texTarget: TEX_1D { $$ = TEXTURE_1D_INDEX; }
| TEX_ARRAY2D { $$ = TEXTURE_2D_ARRAY_INDEX; }
| TEX_ARRAYSHADOW1D { $$ = -TEXTURE_1D_ARRAY_INDEX; }
| TEX_ARRAYSHADOW2D { $$ = -TEXTURE_2D_ARRAY_INDEX; }
+ | string
+ {
+ int valid = 0;
+
+ /* The NV_vertex_program3 spec is just plain broken. While
+ * ARB_fragment_program correctly makes SHADOW1D, SHADOW2D, CUBE,
+ * and RECT reserved words, NV_vp3 does not. To work around this,
+ * the lexer treats these as IDENTIFIER or USED_IDENTIFIER, and the
+ * parser has to do the matching.
+ */
+ if (state->option.NV_vertex3) {
+ if (strncmp("SHADOW", $1, 6) == 0) {
+ const char *const subTarget = & $1[6];
+
+ if (strcmp("1D", subTarget) == 0) {
+ $$ = -TEXTURE_1D_INDEX;
+ valid = state->option.Shadow;
+ } else if (strcmp("2D", subTarget) == 0) {
+ $$ = -TEXTURE_2D_INDEX;
+ valid = state->option.Shadow;
+ } else if (strcmp("RECT", subTarget) == 0) {
+ $$ = -TEXTURE_RECT_INDEX;
+ valid = state->option.Shadow && state->option.TexRect;
+ }
+ } else if (strcmp("CUBE", $1) == 0) {
+ $$ = TEXTURE_CUBE_INDEX;
+ valid = 1;
+ } else if (strcmp("RECT", $1) == 0) {
+ $$ = TEXTURE_RECT_INDEX;
+ valid = state->option.TexRect;
+ }
+ }
+
+ if (!valid) {
+ yyerror(& @1, state, "invalid texture target");
+ YYERROR;
+ }
+ }
;
SWZ_instruction: SWZ maskedDstReg ',' srcReg ',' extendedSwizzle
@@ -535,6 +636,33 @@ SWZ_instruction: SWZ maskedDstReg ',' srcReg ',' extendedSwizzle
}
;
+BRA_instruction: BRA_OP labelName optionalCcMask
+ {
+ $$ = asm_instruction_copy_ctor(& $1, NULL, NULL, NULL, NULL);
+
+ /* Since we don't know whether or not the branch label is valid,
+ * store the position of the label. This allows use to generate a
+ * sensible error message later.
+ */
+ $$->Base.Data = $2;
+ $$->position = @2;
+
+ $$->Base.DstReg.CondMask = $3.CondMask;
+ $$->Base.DstReg.CondSwizzle = $3.CondSwizzle;
+ $$->Base.DstReg.CondSrc = $3.CondSrc;
+ }
+ ;
+
+FLOWCC_instruction: FLOW_OP optionalCcMask
+ {
+ $$ = asm_instruction_copy_ctor(& $1, NULL, NULL, NULL, NULL);
+
+ $$->Base.DstReg.CondMask = $2.CondMask;
+ $$->Base.DstReg.CondSwizzle = $2.CondSwizzle;
+ $$->Base.DstReg.CondSrc = $2.CondSrc;
+ }
+ ;
+
scalarSrcReg: optionalSign scalarUse
{
$$ = $2;
@@ -547,7 +675,7 @@ scalarSrcReg: optionalSign scalarUse
{
$$ = $3;
- if (!state->option.NV_fragment) {
+ if (!state->option.NV_fragment && !state->option.NV_vertex2) {
yyerror(& @2, state, "unexpected character '|'");
YYERROR;
}
@@ -571,7 +699,7 @@ scalarUse: srcReg scalarSuffix
{
struct asm_symbol temp_sym;
- if (!state->option.NV_fragment) {
+ if (!state->option.NV_fragment && !state->option.NV_vertex2) {
yyerror(& @1, state, "expected scalar suffix");
YYERROR;
}
@@ -601,7 +729,7 @@ swizzleSrcReg: optionalSign srcReg swizzleSuffix
{
$$ = $3;
- if (!state->option.NV_fragment) {
+ if (!state->option.NV_fragment && !state->option.NV_vertex2) {
yyerror(& @2, state, "unexpected character '|'");
YYERROR;
}
@@ -642,12 +770,37 @@ maskedDstReg: dstReg optionalMask optionalCcMask
}
;
-maskedAddrReg: addrReg addrWriteMask
+instResultAddr: addrReg optionalMask optionalCcMask
{
+ if (!state->option.NV_vertex2) {
+ if ($2.mask != WRITEMASK_X) {
+ yyerror(& @2, state,
+ "address register write mask must be \".x\"");
+ YYERROR;
+ }
+ }
+
init_dst_reg(& $$);
$$.File = PROGRAM_ADDRESS;
- $$.Index = 0;
+ $$.Index = $1->binding;
$$.WriteMask = $2.mask;
+ $$.CondMask = $3.CondMask;
+ $$.CondSwizzle = $3.CondSwizzle;
+ $$.CondSrc = $3.CondSrc;
+ }
+ ;
+
+ /* The "VNS" part means "vector, no swizzle".
+ */
+instOperandAddrVNS: addrUseVNS
+ ;
+
+addrUseVNS: addrReg
+ {
+ init_src_reg(& $$);
+ $$.Base.File = PROGRAM_ADDRESS;
+ $$.Base.Index = $1->binding;
+ $$.Symbol = $1;
}
;
@@ -777,7 +930,7 @@ srcReg: USED_IDENTIFIER /* temporaryReg | progParamSingle */
switch (s->type) {
case at_temp:
$$.Base.File = PROGRAM_TEMPORARY;
- $$.Base.Index = s->temp_binding;
+ $$.Base.Index = s->binding;
break;
case at_param:
$$.Base.File = s->param_binding_type;
@@ -785,7 +938,7 @@ srcReg: USED_IDENTIFIER /* temporaryReg | progParamSingle */
break;
case at_attrib:
$$.Base.File = PROGRAM_INPUT;
- $$.Base.Index = s->attrib_binding;
+ $$.Base.Index = s->binding;
state->prog->InputsRead |= (1U << $$.Base.Index);
if (!validate_inputs(& @1, state)) {
@@ -825,6 +978,8 @@ srcReg: USED_IDENTIFIER /* temporaryReg | progParamSingle */
$$.Base.RelAddr = 1;
$$.Base.Index = $3.Base.Index;
+ $$.Base.AddrReg = $3.Base.AddrReg;
+ $$.Base.AddrComponent = $3.Base.AddrComponent;
$$.Symbol = $1;
} else {
$$.Base.Index = $1->param_binding_begin + $3.Base.Index;
@@ -863,11 +1018,11 @@ dstReg: resultBinding
switch (s->type) {
case at_temp:
$$.File = PROGRAM_TEMPORARY;
- $$.Index = s->temp_binding;
+ $$.Index = s->binding;
break;
case at_output:
$$.File = PROGRAM_OUTPUT;
- $$.Index = s->output_binding;
+ $$.Index = s->binding;
break;
default:
$$.File = s->param_binding_type;
@@ -905,13 +1060,11 @@ progParamArrayAbs: INTEGER
progParamArrayRel: addrReg addrComponent addrRegRelOffset
{
- /* FINISHME: Add support for multiple address registers.
- */
- /* FINISHME: Add support for 4-component address registers.
- */
init_src_reg(& $$);
$$.Base.RelAddr = 1;
$$.Base.Index = $3;
+ $$.Base.AddrReg = $1->binding;
+ $$.Base.AddrComponent = $2;
}
;
@@ -968,23 +1121,21 @@ addrReg: USED_IDENTIFIER
addrComponent: MASK1
{
- if ($1.mask != WRITEMASK_X) {
+ if (!state->option.NV_vertex2 && ($1.mask != WRITEMASK_X)) {
yyerror(& @1, state, "invalid address component selector");
YYERROR;
} else {
- $$ = $1;
- }
- }
- ;
-
-addrWriteMask: MASK1
- {
- if ($1.mask != WRITEMASK_X) {
- yyerror(& @1, state,
- "address register write mask must be \".x\"");
- YYERROR;
- } else {
- $$ = $1;
+ switch ($1.mask) {
+ case WRITEMASK_X: $$ = 0; break;
+ case WRITEMASK_Y: $$ = 1; break;
+ case WRITEMASK_Z: $$ = 2; break;
+ case WRITEMASK_W: $$ = 3; break;
+
+ /* It should be impossible to get here because the RHS of the
+ * production is MASK1.
+ */
+ default: YYERROR; break;
+ }
}
}
;
@@ -1003,10 +1154,24 @@ optionalMask: MASK4 | MASK3 | MASK2 | MASK1
optionalCcMask: '(' ccTest ')'
{
+ if (!state->option.NV_vertex2
+ && !state->option.NV_fragment) {
+ yyerror(& @1, state,
+ "conditional write mask invalid in this program mode");
+ YYERROR;
+ }
+
$$ = $2;
}
| '(' ccTest2 ')'
{
+ if (!state->option.NV_vertex2
+ && !state->option.NV_fragment) {
+ yyerror(& @1, state,
+ "conditional write mask invalid in this program mode");
+ YYERROR;
+ }
+
$$ = $2;
}
|
@@ -1033,8 +1198,8 @@ ccTest2: ccMaskRule2 swizzleSuffix
ccMaskRule: IDENTIFIER
{
- const int cond = _mesa_parse_cc($1);
- if ((cond == 0) || ($1[2] != '\0')) {
+ const int good_cond = _mesa_parse_cc(state, $1, & $$);
+ if (! good_cond) {
char *const err_str =
make_error_string("invalid condition code \"%s\"", $1);
@@ -1048,16 +1213,14 @@ ccMaskRule: IDENTIFIER
YYERROR;
}
- $$.CondMask = cond;
$$.CondSwizzle = SWIZZLE_NOOP;
- $$.CondSrc = 0;
}
;
ccMaskRule2: USED_IDENTIFIER
{
- const int cond = _mesa_parse_cc($1);
- if ((cond == 0) || ($1[2] != '\0')) {
+ const int good_cond = _mesa_parse_cc(state, $1, & $$);
+ if (! good_cond) {
char *const err_str =
make_error_string("invalid condition code \"%s\"", $1);
@@ -1071,12 +1234,32 @@ ccMaskRule2: USED_IDENTIFIER
YYERROR;
}
- $$.CondMask = cond;
$$.CondSwizzle = SWIZZLE_NOOP;
- $$.CondSrc = 0;
}
;
+labelStatement: labelName
+ {
+ const void *const label =
+ _mesa_symbol_table_find_symbol(state->st, 1, $1);
+
+ if (label != NULL) {
+ yyerror(& @1, state, "duplicate label");
+ YYERROR;
+ } else {
+ /* We have to bias the offset by one so that we don't add a
+ * symbol with zero value. That will fail the symbol existence
+ * test above.
+ */
+ const intptr_t offset = state->prog->NumInstructions + 1;
+ _mesa_symbol_table_add_symbol(state->st, 1, $1, (void *) offset);
+ }
+ }
+ ;
+
+labelName: IDENTIFIER | USED_IDENTIFIER
+ ;
+
namingStatement: ATTRIB_statement
| PARAM_statement
| TEMP_statement
@@ -1093,8 +1276,8 @@ ATTRIB_statement: ATTRIB IDENTIFIER '=' attribBinding
if (s == NULL) {
YYERROR;
} else {
- s->attrib_binding = $4;
- state->InputsBound |= (1U << s->attrib_binding);
+ s->binding = $4;
+ state->InputsBound |= (1U << s->binding);
if (!validate_inputs(& @4, state)) {
YYERROR;
@@ -1972,7 +2155,7 @@ OUTPUT_statement: optVarSize OUTPUT IDENTIFIER '=' resultBinding
if (s == NULL) {
YYERROR;
} else {
- s->output_binding = $5;
+ s->binding = $5;
}
}
;
@@ -2026,6 +2209,11 @@ resultBinding: RESULT POSITION
YYERROR;
}
}
+ | RESULT CLIP '[' stateClipPlaneNum ']'
+ {
+ yyerror(& @2, state, "user clip planes not yet supported");
+ YYERROR;
+ }
;
resultColBinding: COLOR optResultFaceType optResultColorType
@@ -2173,8 +2361,14 @@ asm_instruction_set_operands(struct asm_instruction *inst,
const struct asm_src_register *src1,
const struct asm_src_register *src2)
{
- /* In the core ARB extensions only the KIL instruction doesn't have a
- * destination register.
+ /* In the extensions supported by this assembler, the following instructions
+ * do not have destination registers:
+ *
+ * KIL (GL_ARB_fragment_program and GL_NV_fragment_program_option)
+ * BRA (GL_NV_vertex_program2_option)
+ * CAL (GL_NV_vertex_program2_option)
+ * RET (GL_NV_vertex_program2_option)
+ * PUSHA (GL_NV_vertex_program3)
*/
if (dst == NULL) {
init_dst_reg(& inst->Base.DstReg);
@@ -2182,8 +2376,14 @@ asm_instruction_set_operands(struct asm_instruction *inst,
inst->Base.DstReg = *dst;
}
- /* The only instruction that doesn't have any source registers is the
- * condition-code based KIL instruction added by NV_fragment_program_option.
+ /* In the extensions supported by this assembler, the following instructions
+ * do not have any source registers:
+ *
+ * KIL (GL_NV_fragment_program_option)
+ * BRA (GL_NV_vertex_program2_option)
+ * CAL (GL_NV_vertex_program2_option)
+ * RET (GL_NV_vertex_program2_option)
+ * POPA (GL_NV_vertex_program3)
*/
if (src0 != NULL) {
inst->Base.SrcReg[0] = src0->Base;
@@ -2321,7 +2521,7 @@ declare_variable(struct asm_parser_state *state, char *name, enum asm_type t,
return NULL;
}
- s->temp_binding = state->prog->NumTemporaries;
+ s->binding = state->prog->NumTemporaries;
state->prog->NumTemporaries++;
break;
@@ -2332,8 +2532,7 @@ declare_variable(struct asm_parser_state *state, char *name, enum asm_type t,
return NULL;
}
- /* FINISHME: Add support for multiple address registers.
- */
+ s->binding = state->prog->NumAddressRegs;
state->prog->NumAddressRegs++;
break;
@@ -2545,6 +2744,7 @@ _mesa_parse_arb_program(GLcontext *ctx, GLenum target, const GLubyte *str,
GLboolean result = GL_FALSE;
void *temp;
struct asm_symbol *sym;
+ unsigned main_offset;
state->ctx = ctx;
state->prog->Target = target;
@@ -2601,7 +2801,59 @@ _mesa_parse_arb_program(GLcontext *ctx, GLenum target, const GLubyte *str,
}
-
+ /* Search the instruction stream for BRA and CAL opcodes. Attempt to
+ * resolve the branch targets.
+ */
+ for (inst = state->inst_head; inst != NULL; inst = inst->next) {
+ if ((inst->Base.Opcode == OPCODE_CAL)
+ || (inst->Base.Opcode == OPCODE_BRA)) {
+ const char *const label = inst->Base.Data;
+ unsigned offset;
+
+ offset = (unsigned) (intptr_t)
+ _mesa_symbol_table_find_symbol(state->st, 1, label);
+ if (offset == 0) {
+ yyerror(& inst->position, state, "invalid branch target");
+ goto error;
+ } else {
+ inst->Base.BranchTarget = offset - 1;
+ }
+ }
+ }
+
+ /* If either there is no "main" label (offset of zero) or the "main" label
+ * is at the first instruction of the shader, do nothing. Otherwise
+ * prepend an unconditional branch to the main label. This also means that
+ * all branch targets need to be incremented by one instruction.
+ */
+ main_offset = (unsigned) (intptr_t)
+ _mesa_symbol_table_find_symbol(state->st, 1, "main");
+ if (main_offset > 1) {
+ struct asm_instruction *bra_to_main =
+ asm_instruction_ctor(OPCODE_BRA, NULL, NULL, NULL, NULL);
+
+ /* The -1 handles the biasing on the stored offset, and the +1 handles
+ * the offset caused by inserting a new instruction.
+ */
+ bra_to_main->Base.BranchTarget = main_offset - 1 + 1;
+
+ /* Insert the instruction in the list.
+ */
+ bra_to_main->next = state->inst_head;
+ state->inst_head = bra_to_main;
+ state->prog->NumInstructions++;
+
+ /* Bump the offsets of all other branch instructions.
+ */
+ for (inst = bra_to_main->next; inst != NULL; inst = inst->next) {
+ if ((inst->Base.Opcode == OPCODE_CAL)
+ || (inst->Base.Opcode == OPCODE_BRA)) {
+ inst->Base.BranchTarget++;
+ }
+ }
+ }
+
+
/* Add one instruction to store the "END" instruction.
*/
state->prog->Instructions =
diff --git a/src/mesa/shader/program_parse_extra.c b/src/mesa/shader/program_parse_extra.c
index 0656c5eaa8..70e6bfaa92 100644
--- a/src/mesa/shader/program_parse_extra.c
+++ b/src/mesa/shader/program_parse_extra.c
@@ -69,11 +69,18 @@ _mesa_parse_instruction_suffix(const struct asm_parser_state *state,
/* The next possible suffix element is the condition code modifier selection
* from NV_fragment_program_option.
*/
- if (state->option.NV_fragment) {
+ if (state->option.NV_fragment || state->option.NV_vertex2) {
if (suffix[0] == 'C') {
inst->CondUpdate = 1;
suffix++;
}
+
+ if (state->option.NV_vertex3) {
+ if ((suffix[0] == '0') || (suffix[0] == '1')) {
+ inst->CondDst = suffix[0] - '0';
+ suffix++;
+ }
+ }
}
@@ -95,7 +102,8 @@ _mesa_parse_instruction_suffix(const struct asm_parser_state *state,
int
-_mesa_parse_cc(const char *s)
+_mesa_parse_cc(const struct asm_parser_state *state, const char *s,
+ struct prog_dst_register *dst)
{
int cond = 0;
@@ -144,16 +152,73 @@ _mesa_parse_cc(const char *s)
break;
}
- return ((cond == 0) || (s[2] != '\0')) ? 0 : cond;
+
+ /* The first part of the condition code failed to parse.
+ */
+ if (cond == 0) {
+ return 0;
+ }
+
+
+ if (state->option.NV_vertex3) {
+ if (((s[2] == '0') && (s[3] == '\0'))
+ || (s[2] == '\0')) {
+ dst->CondSrc = 0;
+ dst->CondMask = cond;
+ return 1;
+ } else if ((s[2] == '0') && (s[3] == '\0')) {
+ dst->CondSrc = 1;
+ dst->CondMask = cond;
+ return 1;
+ }
+ } else if (s[2] == '\0') {
+ dst->CondSrc = 0;
+ dst->CondMask = cond;
+ return 1;
+ }
+
+ return 0;
}
int
_mesa_ARBvp_parse_option(struct asm_parser_state *state, const char *option)
{
- if (strcmp(option, "ARB_position_invariant") == 0) {
- state->option.PositionInvariant = 1;
- return 1;
+ if (strncmp(option, "ARB_", 4) == 0) {
+ /* Advance the pointer past the "ARB_" prefix.
+ */
+ option += 4;
+
+ if (strcmp(option, "position_invariant") == 0) {
+ state->option.PositionInvariant = 1;
+ return 1;
+ } else if (strcmp(option, "fragment_program_shadow") == 0) {
+ if (state->ctx->Extensions.ARB_fragment_program_shadow
+ && state->ctx->Extensions.NV_vertex_program3
+ && state->option.NV_vertex3) {
+ state->option.Shadow = 1;
+ return 1;
+ }
+ }
+ } else if (strncmp(option, "NV_vertex_program", 17) == 0) {
+ option += 17;
+
+ /* Other NV_vertex_program strings may be supported later.
+ */
+ if ((option[0] == '2') && (option[1] == '\0')) {
+ if (state->ctx->Extensions.NV_vertex_program2_option) {
+ state->option.NV_vertex2 = 1;
+ return 1;
+ }
+ } else if ((option[0] == '3') && (option[1] == '\0')) {
+ if (state->ctx->Extensions.NV_vertex_program3) {
+ state->option.NV_vertex2 = 1;
+ state->option.NV_vertex3 = 1;
+ state->option.TexRect =
+ (state->ctx->Extensions.NV_texture_rectangle != GL_FALSE);
+ return 1;
+ }
+ }
}
return 0;
diff --git a/src/mesa/shader/program_parser.h b/src/mesa/shader/program_parser.h
index bce6041381..23de410465 100644
--- a/src/mesa/shader/program_parser.h
+++ b/src/mesa/shader/program_parser.h
@@ -29,6 +29,17 @@ struct __GLcontextRec;
typedef struct __GLcontextRec GLcontext;
#endif
+typedef struct YYLTYPE {
+ int first_line;
+ int first_column;
+ int last_line;
+ int last_column;
+ int position;
+} YYLTYPE;
+
+#define YYLTYPE_IS_DECLARED 1
+#define YYLTYPE_IS_TRIVIAL 1
+
enum asm_type {
at_none,
at_address,
@@ -42,8 +53,11 @@ struct asm_symbol {
struct asm_symbol *next; /**< List linkage for freeing. */
const char *name;
enum asm_type type;
- unsigned attrib_binding;
- unsigned output_binding; /**< Output / result register number. */
+
+ /**
+ * Index of the register assigned to this variable.
+ */
+ unsigned binding;
/**
* One of PROGRAM_STATE_VAR, PROGRAM_LOCAL_PARAM, or PROGRAM_ENV_PARAM.
@@ -63,11 +77,6 @@ struct asm_symbol {
unsigned param_binding_length;
/**
- * Index of the temp register assigned to this variable.
- */
- unsigned temp_binding;
-
- /**
* Flag whether or not a PARAM is an array
*/
unsigned param_is_array:1;
@@ -121,6 +130,7 @@ struct asm_instruction {
struct prog_instruction Base;
struct asm_instruction *next;
struct asm_src_register SrcReg[3];
+ YYLTYPE position;
};
@@ -203,6 +213,8 @@ struct asm_parser_state {
unsigned TexRect:1;
unsigned TexArray:1;
unsigned NV_fragment:1;
+ unsigned NV_vertex2:1;
+ unsigned NV_vertex3:1;
} option;
struct {
@@ -217,17 +229,6 @@ struct asm_parser_state {
#define OPTION_NICEST 1
#define OPTION_FASTEST 2
-typedef struct YYLTYPE {
- int first_line;
- int first_column;
- int last_line;
- int last_column;
- int position;
-} YYLTYPE;
-
-#define YYLTYPE_IS_DECLARED 1
-#define YYLTYPE_IS_TRIVIAL 1
-
extern GLboolean _mesa_parse_arb_program(GLcontext *ctx, GLenum target,
const GLubyte *str, GLsizei len, struct asm_parser_state *state);
@@ -289,6 +290,7 @@ extern int _mesa_parse_instruction_suffix(const struct asm_parser_state *state,
* One of the \c COND_ macros defined in prog_instruction.h on success or zero
* on failure.
*/
-extern int _mesa_parse_cc(const char *s);
+extern int _mesa_parse_cc(const struct asm_parser_state *state, const char *s,
+ struct prog_dst_register *dst);
/*@}*/
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-23 20:16:48 +0000