From ccd70a705e184a669038ac41ab9c729478c17839 Mon Sep 17 00:00:00 2001 From: edwin Date: Thu, 12 Oct 2006 14:18:25 +0000 Subject: [PATCH] * src/vm/jit/verify/typecheck.c (verify_invocation): Prepared for addeding the stackbased verifier. No functional change, yet. (verify_builtin): Likewise. --- src/vm/jit/verify/typecheck.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/vm/jit/verify/typecheck.c b/src/vm/jit/verify/typecheck.c index 14e8ba515..7debe5ada 100644 --- a/src/vm/jit/verify/typecheck.c +++ b/src/vm/jit/verify/typecheck.c @@ -28,7 +28,7 @@ Changes: Christian Thalinger - $Id: typecheck.c 5750 2006-10-12 14:12:41Z edwin $ + $Id: typecheck.c 5751 2006-10-12 14:18:25Z edwin $ */ @@ -560,12 +560,16 @@ static bool verify_invocation(verifier_state *state) { jitdata *jd; - varinfo *dv; + varinfo *dv; /* output variable of current instruction */ jd = state->jd; dv = VAROP(state->iptr->dst); +#define TYPECHECK_VARIABLESBASED +#define OP1 VAR(state->iptr->sx.s23.s2.args[0]) #include +#undef OP1 +#undef TYPECHECK_VARIABLESBASED return true; } @@ -587,18 +591,21 @@ verify_invocation(verifier_state *state) static bool verify_builtin(verifier_state *state) { - varinfo *dv; jitdata *jd; + varinfo *dv; /* output variable of current instruction */ jd = state->jd; dv = VAROP(state->iptr->dst); +#define TYPECHECK_VARIABLESBASED +#define OP1 state->iptr->sx.s23.s2.args[0] #include +#undef OP1 +#undef TYPECHECK_VARIABLESBASED return true; } - /* verify_multianewarray ******************************************************* Verify a MULTIANEWARRAY instruction. -- 2.25.1