From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PsFWh-0004FE-JK for garchives@archives.gentoo.org; Wed, 23 Feb 2011 14:17:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CBFCDE06C8; Wed, 23 Feb 2011 14:17:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 75B89E06C8 for ; Wed, 23 Feb 2011 14:17:02 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B39C31B4051 for ; Wed, 23 Feb 2011 14:17:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id ECA2A8006A for ; Wed, 23 Feb 2011 14:17:00 +0000 (UTC) From: "Jonathan-Christofer Demay" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jonathan-Christofer Demay" Message-ID: <533ac92a825257fd5995738ccab5683abc85e52e.jcdemay@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/frama-c/files/, sci-mathematics/frama-c/ X-VCS-Repository: proj/sci X-VCS-Files: sci-mathematics/frama-c/files/frama-c-20101202_beta2-local_tmps.patch sci-mathematics/frama-c/frama-c-20101202_beta2.ebuild X-VCS-Directories: sci-mathematics/frama-c/files/ sci-mathematics/frama-c/ X-VCS-Committer: jcdemay X-VCS-Committer-Name: Jonathan-Christofer Demay X-VCS-Revision: 533ac92a825257fd5995738ccab5683abc85e52e Date: Wed, 23 Feb 2011 14:17:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: b33cf380d983544f495f5e2de593dfb5 commit: 533ac92a825257fd5995738ccab5683abc85e52e Author: Jonathan-Christofer Demay gmail com> AuthorDate: Wed Feb 23 16:19:06 2011 +0000 Commit: Jonathan-Christofer Demay gmail com> CommitDate: Wed Feb 23 16:19:06 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D533ac92a sci-mathematics/frama-c: temporary retro-compatibility patch --- .../files/frama-c-20101202_beta2-local_tmps.patch | 125 ++++++++++++++= ++++++ .../frama-c/frama-c-20101202_beta2.ebuild | 2 + 2 files changed, 127 insertions(+), 0 deletions(-) diff --git a/sci-mathematics/frama-c/files/frama-c-20101202_beta2-local_t= mps.patch b/sci-mathematics/frama-c/files/frama-c-20101202_beta2-local_tm= ps.patch new file mode 100644 index 0000000..bd131a0 --- /dev/null +++ b/sci-mathematics/frama-c/files/frama-c-20101202_beta2-local_tmps.pat= ch @@ -0,0 +1,125 @@ +diff -Naurp frama-c-Carbon-20101202-beta2-orig/cil/src/frontc/cabs2cil.m= l frama-c-Carbon-20101202-beta2/cil/src/frontc/cabs2cil.ml +--- frama-c-Carbon-20101202-beta2-orig/cil/src/frontc/cabs2cil.ml 2010-1= 2-17 13:17:07.000000000 +0000 ++++ frama-c-Carbon-20101202-beta2/cil/src/frontc/cabs2cil.ml 2011-02-23 = 15:20:36.000000000 +0000 +@@ -671,13 +671,11 @@ let newTempVar descr (descrpure:bool) ty + vi.vdescrpure <- descrpure; + (* Rename if clash, but do not add to the environment *) + let vi =3D alphaConvertVarAndAddToEnv false vi in +- (* + (* the temporary is local to the function: the normalization can use = it + wherever it wants. + *) + !currentFunctionFDEC.sbody.blocals <- + vi :: !currentFunctionFDEC.sbody.blocals; +- *) + vi +=20 + let mkAddrOfAndMark loc ((b, off) as lval) : exp =3D +@@ -4715,7 +4713,7 @@ and doExp local_env + (if uop =3D A.POSINCR then "++" else "--") in + let tmp =3D newTempVar (Some descr) true t in + ([var tmp], +- local_var_chunk se' tmp +++ ++ se' +++ + (mkStmtOneInstr ~ghost:local_env.is_ghost + (Set(var tmp, e', CurrentLoc.get ())),[],[],[]), + (* the tmp variable should not be investigated for +@@ -4811,13 +4809,11 @@ and doExp local_env + if needsTemp then + let descr =3D Some (Pretty_utils.sfprintf "%a" dd_lval = lv) in + let tmp =3D newTempVar descr true lvt in +- let chunk =3D +- i2c +- (mkStmtOneInstr ~ghost:local_env.is_ghost +- (Set(lv, new_exp (Lval(var tmp)), loc)), +- [lv],[lv],var tmp :: r1') +- in +- ([],var tmp, local_var_chunk chunk tmp) ++ ([],var tmp, ++ i2c ++ (mkStmtOneInstr ~ghost:local_env.is_ghost ++ (Set(lv, new_exp (Lval(var tmp)), loc)), ++ [lv],[lv],var tmp :: r1')) + else r1',lv, empty + in + let (r2,se2, _, _) =3D +@@ -4939,17 +4935,14 @@ and doExp local_env + let tmp =3D + newTempVar (Some "") true intType + in +- let condChunk =3D +- compileCondExp false ce ++ finishExp [] ++ (compileCondExp false ce + (empty +++ + (mkStmtOneInstr ~ghost:local_env.is_ghost + (Set(var tmp, integer 1,loc)),[],[],[])) + (empty +++ + (mkStmtOneInstr ~ghost:local_env.is_ghost +- (Set(var tmp, integer 0,loc)),[],[],[])) +- in +- finishExp [] +- (local_var_chunk condChunk tmp) ++ (Set(var tmp, integer 0,loc)),[],[],[]))) + (new_exp ~loc (Lval (var tmp))) + intType + end +@@ -5046,7 +5039,6 @@ and doExp local_env + newTempVar + (Some (Pretty_utils.sfprintf "%a" dd_exp e)) true t + in +- let c =3D local_var_chunk c tmp in + (* create an instruction to give the e to the temporary *) + let i =3D mkStmtOneInstr ~ghost:local_env.is_ghost + (Set(var tmp, e, loc)) in +@@ -5145,7 +5137,6 @@ and doExp local_env + ASet (is_real,lv, r, lvt) -> is_real, lv, r, lvt + | _ -> + let v =3D newTempVar None true resTyp in +- prechunk:=3D local_var_chunk !prechunk v; + false, var v, [], resTyp + in + pwhat :=3D (ASet (is_real, destlv, r, destlvtyp)); +@@ -5275,7 +5266,6 @@ and doExp local_env + (Pretty_utils.pp_list ~sep:", " dd_exp) !pargs + in + let tmp =3D newTempVar (Some descr) false restype'' in +- prechunk:=3Dlocal_var_chunk !prechunk tmp; + (* Remember that this variable has been created for this + * specific call. We will use this in collapseCallCast. *= ) + IH.add callTempVars tmp.vid (); +@@ -5371,7 +5361,6 @@ and doExp local_env + let (r1,se1, _, _) =3D + doExp local_env asconst e1 (ASet(false, tmp_var, [], = tresult)) + in +- let se1 =3D local_var_chunk se1 tmp in + let r3,se3,_,_ =3D + finishExp + ~newWhat:(ASet(false,tmp_var, [], tresult)) r3 se3 = e3' t3 +@@ -5388,7 +5377,7 @@ and doExp local_env + | ASet (is_real, lv, r, lvt) -> is_real, lv, r, lvt, = empty + | _ -> + let tmp =3D newTempVar None true tresult in +- false, var tmp, [], tresult, local_var_chunk empt= y tmp ++ false, var tmp, [], tresult, empty + in + (* Now do e2 and e3 for real *) + let (r2,se2, _, _) =3D +@@ -5461,7 +5450,7 @@ and doExp local_env + b.bstmts @ + [Cil.mkStmtOneInstr ~ghost:local_env.is_ghost + (Set (Cil.var vi, e,loc))]; +- (local_var_chunk se vi,Cil.new_exp ~loc (Lval (Cil.va= r vi))) ++ (se,Cil.new_exp ~loc (Lval (Cil.var vi))) + | _ -> se,e + in + finishExp [] se e t +@@ -6583,7 +6572,7 @@ and createLocal ghost ((_, sto, _, _) as + (Some (Pretty_utils.sfprintf "alloca(%a)" d_exp sizeof)= ) + false rt + in +- (local_var_chunk setlen tmp) ++ setlen + +++ (mkStmtOneInstr ~ghost + (Call(Some(var tmp), new_exp ~loc (Lval(var alloca))= , + [ sizeof ], CurrentLoc.get ())),[],[],[]) diff --git a/sci-mathematics/frama-c/frama-c-20101202_beta2.ebuild b/sci-= mathematics/frama-c/frama-c-20101202_beta2.ebuild index 05e24cf..1bf1977 100644 --- a/sci-mathematics/frama-c/frama-c-20101202_beta2.ebuild +++ b/sci-mathematics/frama-c/frama-c-20101202_beta2.ebuild @@ -32,6 +32,8 @@ S=3D"${WORKDIR}/${PN/-c/-c-$NAME}-${PV/_/-}" src_prepare(){ rm share/libc/test.c rm -Rf src/wp + + epatch "${FILESDIR}/${P}-local_tmps.patch" =09 touch config_file sed -i configure.in \