From dev-return-34033-apmail-harmony-dev-archive=harmony.apache.org@harmony.apache.org Sun May 04 17:48:00 2008 Return-Path: Delivered-To: apmail-harmony-dev-archive@www.apache.org Received: (qmail 96034 invoked from network); 4 May 2008 17:48:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 May 2008 17:48:00 -0000 Received: (qmail 382 invoked by uid 500); 4 May 2008 17:48:00 -0000 Delivered-To: apmail-harmony-dev-archive@harmony.apache.org Received: (qmail 348 invoked by uid 500); 4 May 2008 17:48:00 -0000 Mailing-List: contact dev-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list dev@harmony.apache.org Received: (qmail 327 invoked by uid 99); 4 May 2008 17:48:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 May 2008 10:48:00 -0700 X-ASF-Spam-Status: No, hits=2.0 required=10.0 tests=HTML_MESSAGE,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of nbeyer@gmail.com designates 216.239.58.187 as permitted sender) Received: from [216.239.58.187] (HELO gv-out-0910.google.com) (216.239.58.187) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 May 2008 17:47:16 +0000 Received: by gv-out-0910.google.com with SMTP id c6so123957gvd.22 for ; Sun, 04 May 2008 10:47:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:sender:to:subject:in-reply-to:mime-version:content-type:references:x-google-sender-auth; bh=NmAMjT89FG6JiB7yMNsfD7F8reIenXVwkaFaCU+5v7I=; b=rq/2UNz1KBmWrQBaWf53tN2iy1KaGVsazmDGF2aJmjs/ZVZ+OZZdjPxfQXqDivIXdHZNfQOZYIyYpzP9jbcKPATees5O8Ou0/hWPyJDSFF4fbAbJWU7Yd3KQr6bdsHhlf7d/T66lstwOKbW8fdp3hnjyVbNwaNh+ZFcDj2ltGQ0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:sender:to:subject:in-reply-to:mime-version:content-type:references:x-google-sender-auth; b=mfl9+9osthq2Bg8xaGJJ5KyOBSe13ZCXNYo8pBX+kQfR3QNhMA93eJkhgOJSbWk6yYar2b1IV+6Xx2aGBz+NDavVYSrIb4ItfvefFY88WOtjIag+z+qPnaFYu/pWHGTEYAs0mJExJgAsEu4tXP3JYo+uj8Lja4WGzgIaMXATkfg= Received: by 10.150.50.3 with SMTP id x3mr5402535ybx.33.1209923247916; Sun, 04 May 2008 10:47:27 -0700 (PDT) Received: by 10.150.139.2 with HTTP; Sun, 4 May 2008 10:47:27 -0700 (PDT) Message-ID: <3b3f27c60805041047q2773479ch7fbc98d66ef32b80@mail.gmail.com> Date: Sun, 4 May 2008 12:47:27 -0500 From: "Nathan Beyer" Sender: nbeyer@gmail.com To: dev@harmony.apache.org Subject: [ot] Re: svn commit: r653199 - in /harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet: cg_meth.cpp enc.cpp enc.h In-Reply-To: <20080504113130.1556223889C1@eris.apache.org> MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----=_Part_55_24138303.1209923247633" References: <20080504113130.1556223889C1@eris.apache.org> X-Google-Sender-Auth: 4f1436aa8c37e298 X-Virus-Checked: Checked by ClamAV on apache.org ------=_Part_55_24138303.1209923247633 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline Out of curiosity, does this constant value have special meaning or is it just for fun? #ifdef _EM64T_ - mov(fill, (unsigned long)0xDEADBEEFDEADBEEF); + mov(fill, (uint_ptr)0xDEADBEEFDEADBEEF); #else mov(fill, 0xDEADBEEF); #endif -Nathan On Sun, May 4, 2008 at 6:31 AM, wrote: > Author: mcfirst > Date: Sun May 4 04:31:29 2008 > New Revision: 653199 > > URL: http://svn.apache.org/viewvc?rev=653199&view=rev > Log: > Applying the patch from HARMONY-5789 [drlvm][jet] Smoke test > classloader.StreassLoader crashes DRLVM in server mode on Windows x86-64 > platform > > Modified: > harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_meth.cpp > harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/enc.cpp > harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/enc.h > > Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_meth.cpp > URL: > http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_meth.cpp?rev=653199&r1=653198&r2=653199&view=diff > > ============================================================================== > --- harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_meth.cpp (original) > +++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_meth.cpp Sun May 4 > 04:31:29 2008 > @@ -167,7 +167,7 @@ > } > // > #ifdef _EM64T_ > - mov(fill, (unsigned long)0xDEADBEEFDEADBEEF); > + mov(fill, (uint_ptr)0xDEADBEEFDEADBEEF); > #else > mov(fill, 0xDEADBEEF); > #endif > > Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/enc.cpp > URL: > http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/enc.cpp?rev=653199&r1=653198&r2=653199&view=diff > > ============================================================================== > --- harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/enc.cpp (original) > +++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/enc.cpp Sun May 4 > 04:31:29 2008 > @@ -370,7 +370,7 @@ > } > else { > #ifdef _EM64T_ > - long val = va_arg(valist, long); > + int_ptr val = va_arg(valist, int_ptr); > mov(Opnd(i64, sp, cs.off(i)), val); > #else > int val = lo32((jlong)(int_ptr)addr); > @@ -382,7 +382,7 @@ > } > else if (jt==i64) { > #ifdef _EM64T_ > - long val = va_arg(valist, long); > + int_ptr val = va_arg(valist, int_ptr); > mov(gr == gr_x ? Opnd(i64, sp, cs.off(i)) : Opnd(i64, gr), > val); > #else > assert(false); > > Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/enc.h > URL: > http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/enc.h?rev=653199&r1=653198&r2=653199&view=diff > > ============================================================================== > --- harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/enc.h (original) > +++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/enc.h Sun May 4 > 04:31:29 2008 > @@ -63,6 +63,7 @@ > * @brief A signed integer type, with the same size as a pointer. > */ > typedef POINTER_SIZE_SINT int_ptr; > +typedef POINTER_SIZE_INT uint_ptr; > > /** > * @brief A dynamically grown byte array. > @@ -559,25 +560,29 @@ > clear(); m_jt = i32; m_lval = ival; > } > > +#ifdef POINTER64 > /** > - * @brief Constructs immediate operand of platform-dependent size. > + * @brief Constructs #i64 immediate operand. > * > - * It's i32 on IA32 and i64 on EM64T and IPF. > + * @note Using Opnd(int_ptr) on 32-bit architecture leads to > ambiguity > + * with Opnd(int), so Opnd(int_ptr) is under #ifdef. > */ > - Opnd(long lval) > + Opnd(int_ptr lval) > { > clear(); m_jt = iplatf; m_lval = lval; > } > > /** > - * @brief Constructs immediate operand of platform-dependent size. > + * @brief Constructs i64 immediate operand. > * > - * It's i32 on IA32 and i64 on EM64T and IPF. > + * @note Using Opnd(uint_ptr) on 32-bit architecture leads to > ambiguity > + * with Opnd(unsigned), so Opnd(uint_ptr) is under #ifdef. > */ > - Opnd(unsigned long lval) > + Opnd(uint_ptr lval) > { > clear(); m_jt = iplatf; m_lval = lval; > } > +#endif > > /** > * @brief Constructs memory operand with no type (jvoid). > > > ------=_Part_55_24138303.1209923247633--