Revision: 74688 http://trac.macports.org/changeset/74688 Author: ryandesign@macports.org Date: 2010-12-28 11:53:32 -0800 (Tue, 28 Dec 2010) Log Message: ----------- obc: change the patch; see #27803 Modified Paths: -------------- trunk/dports/lang/obc/Portfile Added Paths: ----------- trunk/dports/lang/obc/files/patch-runtime-keiko.iset.diff Removed Paths: ------------- trunk/dports/lang/obc/files/patch-compiler-icode.ml.diff Modified: trunk/dports/lang/obc/Portfile =================================================================== --- trunk/dports/lang/obc/Portfile 2010-12-28 19:01:19 UTC (rev 74687) +++ trunk/dports/lang/obc/Portfile 2010-12-28 19:53:32 UTC (rev 74688) @@ -5,7 +5,7 @@ name obc version 2.9.0 -revision 1 +revision 2 categories lang platforms darwin maintainers deadpixi.com:jking @@ -27,7 +27,7 @@ depends_build port:ocaml patchfiles patch-destdir.diff \ - patch-compiler-icode.ml.diff + patch-runtime-keiko.iset.diff use_parallel_build no universal_variant no Deleted: trunk/dports/lang/obc/files/patch-compiler-icode.ml.diff =================================================================== --- trunk/dports/lang/obc/files/patch-compiler-icode.ml.diff 2010-12-28 19:01:19 UTC (rev 74687) +++ trunk/dports/lang/obc/files/patch-compiler-icode.ml.diff 2010-12-28 19:53:32 UTC (rev 74688) @@ -1,11 +0,0 @@ ---- compiler/icode.ml 2010-12-23 23:28:05.000000000 -0600 -+++ compiler/icode.ml.new 2010-12-23 23:28:17.000000000 -0600 -@@ -132,7 +132,7 @@ - | ShortT -> fStr "S" - | (IntT | PtrT | SetT) -> fStr "W" - | LongT -> fStr "Q" -- | FloatT -> fStr "F" -+ | FloatT -> fStr "W" - | DoubleT -> fStr "D" - | _ -> fStr "?" - Copied: trunk/dports/lang/obc/files/patch-runtime-keiko.iset.diff (from rev 74651, trunk/dports/lang/obc/files/patch-compiler-icode.ml.diff) =================================================================== --- trunk/dports/lang/obc/files/patch-runtime-keiko.iset.diff (rev 0) +++ trunk/dports/lang/obc/files/patch-runtime-keiko.iset.diff 2010-12-28 19:53:32 UTC (rev 74688) @@ -0,0 +1,27 @@ +--- runtime/keiko.iset 2010-12-27 21:55:07.000000000 -0600 ++++ runtime/keiko.iset.new 2010-12-27 21:57:48.000000000 -0600 +@@ -136,9 +136,11 @@ + # LDIs :: a, b --> mem_s[a+s*b] + # STIs :: a, b, c --> []; mem_s[b+s*c] := a + inst LDIW 0 B.* {subs($1.x, $2.i, type($t))} ++inst LDIF 0 B.f {subs($1.x, $2.i, float)} + inst LDIS 0 B.i {subs($1.x, $2.i, short)} + inst LDIC 0 B.i {subs($1.x, $2.i, uchar)} + inst STIW 0 S3 {subs($2.x, $3.i, type($u1)) = $1.*;} ++inst STIF 0 S3 {subs($2.x, $3.i, float) = $1.f;} + inst STIS 0 S3 {subs($2.x, $3.i, short) = $1.i;} + inst STIC 0 S3 {subs($2.x, $3.i, uchar) = $1.i;} + +@@ -754,10 +756,12 @@ + expand LDIC 0 {INDEXC, LOADC} + expand LDIS 0 {INDEXS, LOADS} + expand LDIW 0 {INDEXW, LOADW} ++expand LDIF 0 {INDEXW, LOADF} + expand LDID 0 {INDEXD, LOADD} + expand STIC 0 {INDEXC, STOREC} + expand STIS 0 {INDEXS, STORES} + expand STIW 0 {INDEXW, STOREW} ++expand STIF 0 {INDEXW, STOREF} + expand STID 0 {INDEXD, STORED} + + expand LDEW 1 {LDLW -4, LDNW $a}