From harmony-commits-return-593-apmail-incubator-harmony-commits-archive=incubator.apache.org@incubator.apache.org Thu Jan 05 02:27:10 2006 Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 41500 invoked from network); 5 Jan 2006 02:27:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 5 Jan 2006 02:27:09 -0000 Received: (qmail 68578 invoked by uid 500); 5 Jan 2006 02:27:09 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 68535 invoked by uid 500); 5 Jan 2006 02:27:08 -0000 Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: harmony-dev@incubator.apache.org Delivered-To: mailing list harmony-commits@incubator.apache.org Received: (qmail 68523 invoked by uid 99); 5 Jan 2006 02:27:08 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jan 2006 18:27:08 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,UPPERCASE_25_50 X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 04 Jan 2006 18:27:08 -0800 Received: (qmail 41432 invoked by uid 65534); 5 Jan 2006 02:26:57 -0000 Message-ID: <20060105022657.41431.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r366058 - /incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/interp.c Date: Thu, 05 Jan 2006 02:26:57 -0000 To: harmony-commits@incubator.apache.org From: archie@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: archie Date: Wed Jan 4 18:26:53 2006 New Revision: 366058 URL: http://svn.apache.org/viewcvs?rev=366058&view=rev Log: Slight code simplification: eliminate a redundant macro. Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/interp.c Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/interp.c URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/interp.c?rev=366058&r1=366057&r2=366058&view=diff ============================================================================== --- incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/interp.c (original) +++ incubator/harmony/enhanced/trunk/sandbox/contribs/jchevm/jchevm/libjc/interp.c Wed Jan 4 18:26:53 2006 @@ -79,7 +79,6 @@ #define PUSHD(v) do { STACKD(0) = (v); sp += 2; } while (0) #define PUSHL(v) do { STACKL(0) = (v); sp++; } while (0) #define POP(i) (sp -= (i)) -#define POP2(i) (sp -= 2 * (i)) #define INFO(f) (code->info[pc].f) @@ -545,7 +544,7 @@ STACKJ(-2) = _JC_CAST_FLT2INT(jdouble, jlong, STACKD(-2)); NEXT(); TARGET(dadd) - POP2(1); + POP(2); STACKD(-2) += STACKD(0); NEXT(); TARGET(daload) @@ -580,32 +579,32 @@ STACKI(-1) = _JC_DCMPL(STACKD(-1), STACKD(1)); NEXT(); TARGET(ddiv) - POP2(1); + POP(2); STACKD(-2) /= STACKD(0); NEXT(); TARGET(dload) PUSHD(LOCALD(INFO(local))); NEXT(); TARGET(dmul) - POP2(1); + POP(2); STACKD(-2) *= STACKD(0); NEXT(); TARGET(dneg) STACKD(-2) = -STACKD(-2); NEXT(); TARGET(drem) - POP2(1); + POP(2); STACKD(-2) = fmod(STACKD(-2), STACKD(0)); NEXT(); TARGET(dreturn) env->retval.d = STACKD(-2); goto done; TARGET(dstore) - POP2(1); + POP(2); LOCALD(INFO(local)) = STACKD(0); NEXT(); TARGET(dsub) - POP2(1); + POP(2); STACKD(-2) -= STACKD(0); NEXT(); TARGET(dup) @@ -1226,7 +1225,7 @@ STACKI(-1) = STACKJ(-1); NEXT(); TARGET(ladd) - POP2(1); + POP(2); STACKJ(-2) += STACKJ(0); NEXT(); TARGET(laload) @@ -1241,7 +1240,7 @@ NEXT(); } TARGET(land) - POP2(1); + POP(2); STACKJ(-2) &= STACKJ(0); NEXT(); TARGET(lastore) @@ -1297,7 +1296,7 @@ *sp++ = ((_jc_word *)&INFO(constant))[1]; NEXT(); TARGET(ldiv) - POP2(1); + POP(2); if (_JC_UNLIKELY(STACKJ(0) == 0)) goto arithmetic_exception; STACKJ(-2) /= STACKJ(0); @@ -1306,7 +1305,7 @@ PUSHJ(LOCALJ(INFO(local))); NEXT(); TARGET(lmul) - POP2(1); + POP(2); STACKJ(-2) *= STACKJ(0); NEXT(); TARGET(lneg) @@ -1325,11 +1324,11 @@ JUMP(entry != NULL ? entry->target : lsw->default_target); } TARGET(lor) - POP2(1); + POP(2); STACKJ(-2) |= STACKJ(0); NEXT(); TARGET(lrem) - POP2(1); + POP(2); if (_JC_UNLIKELY(STACKJ(0) == 0)) goto arithmetic_exception; STACKJ(-2) %= STACKJ(0); @@ -1346,11 +1345,11 @@ STACKJ(-2) = _JC_LSHR(STACKJ(-2), STACKI(0)); NEXT(); TARGET(lstore) - POP2(1); + POP(2); LOCALJ(INFO(local)) = STACKJ(0); NEXT(); TARGET(lsub) - POP2(1); + POP(2); STACKJ(-2) -= STACKJ(0); NEXT(); TARGET(lushr) @@ -1358,7 +1357,7 @@ STACKJ(-2) = _JC_LUSHR(STACKJ(-2), STACKI(0)); NEXT(); TARGET(lxor) - POP2(1); + POP(2); STACKJ(-2) ^= STACKJ(0); NEXT(); TARGET(monitorenter) @@ -1418,7 +1417,7 @@ POP(1); NEXT(); TARGET(pop2) - POP2(1); + POP(2); NEXT(); TARGET(putfield_z) POP(2); @@ -1529,7 +1528,7 @@ *(jint *)INFO(field).u.data = STACKI(0); NEXT(); TARGET(putstatic_j) - POP2(1); + POP(2); *(jlong *)INFO(field).u.data = STACKJ(0); NEXT(); TARGET(putstatic_f) @@ -1537,7 +1536,7 @@ *(jfloat *)INFO(field).u.data = STACKF(0); NEXT(); TARGET(putstatic_d) - POP2(1); + POP(2); *(jdouble *)INFO(field).u.data = STACKD(0); NEXT(); TARGET(putstatic_l)