Joe Groff
|
104c29aabc
|
simd intrinsic implementation for v*high, v*hs+, vavg, and vsad
|
2009-12-05 14:52:18 -08:00 |
Joe Groff
|
412b9d0c7a
|
change compiler.cfg.intrinsics.simd tests to not use types and operations that depend on host cell size
|
2009-12-04 13:23:31 -08:00 |
Joe Groff
|
63b89c65f9
|
don't use intrinsics for simd vector element operations when the component size doesn't fit in a fixnum
|
2009-12-03 12:46:56 -08:00 |
Slava Pestov
|
73eb4c4531
|
Merge branch 'simd-cleanup' of git://factorcode.org/git/factor into simd-cleanup
|
2009-12-02 19:09:56 -05:00 |
Slava Pestov
|
eb840dcf41
|
RT_HERE now takes its argument from the literal table rather than the parameter table, reducing image size further
|
2009-12-02 04:55:48 -06:00 |
Slava Pestov
|
68c09f0e93
|
Split literal table into literal and parameter tables, literal table is discarded after code block initialization
|
2009-12-02 04:28:15 -06:00 |
Joe Groff
|
67cc1c01be
|
Merge branch 'master' into simd-cleanup
|
2009-11-26 16:14:46 -08:00 |
Joe Groff
|
66d0cafa94
|
fix buggy simd intrinsics
|
2009-11-26 13:28:40 -08:00 |
Joe Groff
|
c916c7c856
|
don't try to rewrite redundant test-vector-exprs
|
2009-11-25 20:06:11 -08:00 |
Slava Pestov
|
bd02eef38e
|
Fix non-tail recursive inline recursive compilation
|
2009-11-25 19:12:09 -06:00 |
Joe Groff
|
50f7dff422
|
change name of 'unsign-rep' to more sensible 'signed-rep'
|
2009-11-24 22:44:12 -08:00 |
Joe Groff
|
c98eb84943
|
make math.vectors.simd tests pass again
|
2009-11-24 18:30:12 -08:00 |
Joe Groff
|
9c388bf781
|
update compiler.cfg.intrinsics.simd tests
|
2009-11-24 12:50:27 -08:00 |
Joe Groff
|
65d8060075
|
fix simd intrinsic compilation
|
2009-11-24 11:37:28 -08:00 |
Joe Groff
|
d94ffe6d78
|
scalar fallbacks for simd intrinsics
|
2009-11-23 21:24:55 -08:00 |
Slava Pestov
|
0612bc6177
|
Factor source files should not be executable
|
2009-11-21 17:50:43 -06:00 |
Joe Groff
|
152b0d2df5
|
break simd intrinsics into a separate vocab so they can be intrinsified before the simd methods compile
|
2009-11-19 11:53:46 -08:00 |
Joe Groff
|
59d85f7ad6
|
fix primitive emit fallback for simd intrinsics
|
2009-11-18 21:29:51 -08:00 |
Joe Groff
|
a3e4ecfc7d
|
enable simd intrinsics and fix first-pass compiler errors
|
2009-11-18 20:32:05 -08:00 |
Joe Groff
|
6583875055
|
tests for all simd intrinsics
|
2009-11-18 18:20:58 -08:00 |
Joe Groff
|
f545c5d3e5
|
properly handle -vector-op and case words in simd.backend
|
2009-11-18 12:36:41 -08:00 |
Joe Groff
|
cd2cf91b95
|
start on tests for simd intrinsics
|
2009-11-17 11:13:16 -08:00 |
Slava Pestov
|
e30d275e41
|
compiler.cfg: 'basic-block new hashcode' should not throw an exception; fixes tools.deploy.test.11
|
2009-11-16 02:01:36 -06:00 |
Slava Pestov
|
361c38d5a1
|
heap-size now has a partial-eval instead of being foldable, and the partial-eval adds a dependency on the C type word. Fixes problem where redefining a struct didn't update specialized array
|
2009-11-15 11:26:37 -06:00 |
Joe Groff
|
d56afe9c3d
|
compilation fixes
|
2009-11-14 23:43:22 -06:00 |
Joe Groff
|
f544982fda
|
Merge branch 'master' of git://factorcode.org/git/factor into simd-cleanup
Conflicts:
basis/math/vectors/simd/functor/functor.factor
|
2009-11-14 21:02:39 -06:00 |
Joe Groff
|
8a8699ac98
|
backend fixups
|
2009-11-14 20:59:03 -06:00 |
Slava Pestov
|
7377c96a21
|
compiler.tree.propagation.branches: fix recent constraints change
|
2009-11-13 07:16:41 -06:00 |
Slava Pestov
|
afecb9c758
|
Fixing call( inline caching
|
2009-11-13 04:32:33 -06:00 |
Slava Pestov
|
86da8ebed9
|
Instead of bumping the definition counter every time in the VM, bump it only if stack effects changed or macros were redefined
|
2009-11-13 03:52:14 -06:00 |
Slava Pestov
|
720c412431
|
compiler.tree.propagation: fix bug in constraints that caused retain stack overflow
|
2009-11-13 03:22:57 -06:00 |
Slava Pestov
|
ff25aaef54
|
compiler.tree.propagation.transforms: inline push if types are known. Speeds up reverse-complement, sort, sum-file benchmarks
|
2009-11-12 17:24:32 -06:00 |
Slava Pestov
|
7afea4c0ea
|
compiler.tree.propagation: implementing missing case in branch constraints
|
2009-11-12 17:24:11 -06:00 |
Slava Pestov
|
cba12eae37
|
Invalidate inline caches used by call( and execute( when words are redefined
|
2009-11-12 16:09:07 -06:00 |
Joe Groff
|
e323071c44
|
sever lingering dependencies on simd from compiler
|
2009-11-11 16:08:40 -06:00 |
Slava Pestov
|
41c17f0429
|
Fixing test failures
|
2009-11-11 02:40:24 -06:00 |
Slava Pestov
|
2afd7ce244
|
Faster identity-hashcode primitive; fast path now opencoded by the compiler
|
2009-11-11 02:27:19 -06:00 |
Joe Groff
|
eac9bacf40
|
backend for choosing available SIMD intrinsic implementations
|
2009-11-10 23:35:46 -06:00 |
Slava Pestov
|
064c00f78d
|
New identity-hashcode primitive
|
2009-11-10 21:18:54 -06:00 |
Slava Pestov
|
19283ed83d
|
compiler.cfg.intrinsics.slots: new implementation of value-tag
|
2009-11-10 17:30:27 -06:00 |
Slava Pestov
|
473cc7db4a
|
stack-checker: tighten some screws in error reporting
|
2009-11-09 00:17:24 -06:00 |
Joe Groff
|
788289e51e
|
Merge branch 'master' into simd-cleanup
|
2009-11-08 21:54:53 -06:00 |
Slava Pestov
|
cd2e226afa
|
stack-checker: split off stack-checker.dependencies from stack-checker.state
|
2009-11-08 20:34:46 -06:00 |
Slava Pestov
|
da041a0175
|
compiler.crossref: fix bugs
|
2009-11-08 06:22:39 -06:00 |
Slava Pestov
|
5d79450d9d
|
Use a more compact representation for "compiled-uses" and "compiled-generic-uses" word-props; reduces image size
|
2009-11-08 06:08:04 -06:00 |
Joe Groff
|
8894e9047c
|
Merge branch 'master' into simd-cleanup
|
2009-11-07 22:26:09 -06:00 |
Slava Pestov
|
279d1169d2
|
compiler: fix alien tests
|
2009-11-06 01:04:02 -06:00 |
Joe Groff
|
00ce8b6a33
|
deprimitivize tuck and put it to pasture
|
2009-11-05 22:47:05 -06:00 |
Daniel Ehrenberg
|
d2fe75276e
|
custom inlining for diff and intersect, when given a literal sequence. this cuts off 1/3 of the running time of a microbenchmark
|
2009-11-05 13:13:27 -06:00 |
Joe Groff
|
75d04922b9
|
Merge branch 'master' into simd-cleanup
Conflicts:
basis/math/vectors/simd/functor/functor.factor
|
2009-11-05 11:27:08 -06:00 |
Joe Groff
|
4d54f27cd1
|
more intrinsic madness
|
2009-11-05 09:52:57 -06:00 |
Slava Pestov
|
8c4ad9bf18
|
compiler: fix intrinsics tests on 32-bit
|
2009-11-04 18:28:46 -06:00 |
Joe Groff
|
f6643a1c72
|
change ##horizontal-add-vector insn to better match what the HADD SSE instructions do (add adjacent pairs, pack results)
|
2009-11-04 12:18:01 -06:00 |
Slava Pestov
|
3c4c05e915
|
compiler.cfg.intrinsics.allot: fix inline byte array allocation on 32-bit platforms
|
2009-11-03 23:44:20 -06:00 |
Slava Pestov
|
109aa88b06
|
compiler: update unit tests for 4-bit tag change
|
2009-11-03 21:40:29 -06:00 |
Joe Groff
|
bd77633d5b
|
new intrinsic generators, pt1
|
2009-11-03 21:38:45 -06:00 |
Slava Pestov
|
51e9a891a8
|
cpu.x86: update %box-displaced-alien for introduction of address field
|
2009-11-03 03:17:43 -06:00 |
Slava Pestov
|
91ccc30a54
|
Merge branch 'master' into new_gc
|
2009-11-02 20:34:13 -06:00 |
Slava Pestov
|
0a15ae4d6b
|
compiler.cfg.intrinsics: uncomment line commented out by mistake
|
2009-11-02 20:33:14 -06:00 |
Slava Pestov
|
495f776d54
|
Merge branch 'master' into new_gc
|
2009-11-02 20:11:43 -06:00 |
Slava Pestov
|
8bd2273e44
|
compiler.cfg: don't generate useless methods in instruction meta-programming. reduces bootstrap time
|
2009-11-02 20:11:29 -06:00 |
Slava Pestov
|
a3b5c07e80
|
Minor bug fixes for 4-bit tags
|
2009-11-02 17:41:36 -06:00 |
Joe Groff
|
e36eb438fa
|
move all simd intrinsics to compiler.cfg.intrinsics.simd, and only load it when math.vectors.simd is loaded
|
2009-11-02 15:17:34 -06:00 |
Joe Groff
|
42493b9778
|
update compiler.tree.propagation.simd, and don't load it till math.vectors.simd is loaded
|
2009-11-02 15:09:16 -06:00 |
Slava Pestov
|
e4ad642134
|
vm: 4 bit tags, new representation of alien objects makes unbox-any-c-ptr more efficient (work in progress)
|
2009-11-02 04:25:54 -06:00 |
Slava Pestov
|
37abac7407
|
Merge branch 'master' into new_gc
|
2009-10-30 21:04:37 -05:00 |
Joe Groff
|
3f15e028f7
|
exile roll and -roll to basis/shuffle and mark them deprecated
|
2009-10-30 17:11:45 -05:00 |
Slava Pestov
|
6f9336c29e
|
Merge branch 'master' into new_gc
|
2009-10-30 03:03:05 -05:00 |
Joe Groff
|
1cf45abf06
|
Merge branch 'master' of git://factorcode.org/git/factor
|
2009-10-30 00:42:37 -05:00 |
Joe Groff
|
b858860a67
|
add ##shl-vector-imm and ##shr-vector-imm insn variants. use merge/shr instead of compare/merge to do signed unpacks
|
2009-10-30 00:41:19 -05:00 |
Doug Coleman
|
1d12a6707d
|
sigma -> map-sum
|
2009-10-29 14:34:04 -05:00 |
Doug Coleman
|
17f0a5d41a
|
Merge branch 'master' of git://factorcode.org/git/factor
|
2009-10-28 17:26:23 -05:00 |
Doug Coleman
|
e376a0ece2
|
(normalize-path) -> absolute-path, canonicalize-path -> resolve-symlinks
|
2009-10-28 17:25:50 -05:00 |
Joe Groff
|
3fbe722561
|
Merge branch 'master' of http://factorcode.org/git/factor
Conflicts:
basis/locals/locals.factor
basis/peg/peg.factor
extra/infix/infix.factor
|
2009-10-28 16:17:24 -05:00 |
Joe Groff
|
6e1bffb1c5
|
update existing code to use :> ( ) when possible
|
2009-10-28 16:11:33 -05:00 |
Doug Coleman
|
bd13e018dd
|
memq? -> member-eq?, sorted-memq? -> sorted-member-eq?
|
2009-10-28 15:02:00 -05:00 |
Doug Coleman
|
1476cdb974
|
reverse-here -> reverse!
|
2009-10-28 14:40:15 -05:00 |
Doug Coleman
|
7ce4b746e5
|
parsed -> suffix!, add append!
|
2009-10-28 13:38:27 -05:00 |
Joe Groff
|
2ecf3fb568
|
fix load errors from bootstrapping
|
2009-10-28 12:51:03 -05:00 |
Slava Pestov
|
299b5b0f6c
|
filter-here -> filter!
|
2009-10-28 00:44:05 -05:00 |
Slava Pestov
|
50f5c3d116
|
remq -> remove-eq, delq -> remove-eq!
|
2009-10-28 00:23:08 -05:00 |
Slava Pestov
|
951e3e9c83
|
delete-nth -> remove-nth!
|
2009-10-27 23:41:57 -05:00 |
Slava Pestov
|
08e7d25dc5
|
change-each -> map!, deep-change-each -> deep-map!
|
2009-10-27 22:32:56 -05:00 |
Joe Groff
|
935c0797c3
|
update existing code for [let change
|
2009-10-27 22:05:37 -05:00 |
Joe Groff
|
d17ef38007
|
update compiler.tree.cleanup test
|
2009-10-26 23:01:35 -05:00 |
Slava Pestov
|
9abe29bebc
|
Merge branch 'master' into new_gc
|
2009-10-24 01:31:15 -05:00 |
Slava Pestov
|
0c431f1222
|
compiler.tree.propagation: fix broken corner cases in bitand and shift transforms, exposed by Hugh Aguilar's LC53 benchmark
|
2009-10-24 01:09:32 -05:00 |
Slava Pestov
|
e46259bd33
|
compiler.tree.propagation.transforms: fix problem with 'shift' transform when input was a bignum
|
2009-10-23 07:50:56 -05:00 |
Slava Pestov
|
64ff812611
|
Merge branch 'master' into new_gc
|
2009-10-23 03:56:46 -05:00 |
Slava Pestov
|
e8fd85437b
|
compiler: fix stack effect inference bug discovered by x6j8x; it was possible to define a word which did not compile but could be called anyway
|
2009-10-23 03:27:25 -05:00 |
Slava Pestov
|
3394309659
|
Merge branch 'master' into new_gc
|
2009-10-22 05:40:57 -05:00 |
Joe Groff
|
c3b8847936
|
update a bunch of alien-callbacks and alien-indirects to use c-type words
|
2009-10-21 21:10:11 -05:00 |
Joe Groff
|
7fac3682a6
|
update some naked alien-invokes to use c-type words
|
2009-10-21 18:44:00 -05:00 |
Joe Groff
|
8a6b0a1453
|
generate unsigned vector comparison fallbacks using min/max or xor/signed compare
|
2009-10-20 22:30:57 -05:00 |
Joe Groff
|
cb36111a3c
|
generate better fallback code for vmin/vmax intrinsics
|
2009-10-20 19:22:38 -05:00 |
Joe Groff
|
6f72c3ca24
|
Merge branch 'master' of git://factorcode.org/git/factor
|
2009-10-20 17:42:29 -05:00 |
Joe Groff
|
764e085004
|
value numbering rewrite rules for vector ops to convert "not and" to "andn" and "not andn" to "and"
|
2009-10-20 17:29:01 -05:00 |
Slava Pestov
|
d85d84697a
|
Change data heap alignment to 16 bytes
|
2009-10-20 12:45:00 -05:00 |
Slava Pestov
|
18be7e1f37
|
cpu.x86.32: only create 16-byte parameter area if the word calls into the VM
|
2009-10-20 05:02:42 -05:00 |
Slava Pestov
|
1e7893b6ce
|
compiler: FFI is now slightly more efficient when unboxing parameters, only changes data stack height once
|
2009-10-20 04:31:48 -05:00 |
Slava Pestov
|
560b6f45cc
|
compiler, cpu.x86.32: clean up FFI implementation, in particular 32-bit x86-specific backend
|
2009-10-20 04:15:10 -05:00 |
Slava Pestov
|
b2592e01c1
|
compiler: fix typo in intrinsics tests
|
2009-10-19 05:16:04 -05:00 |
Slava Pestov
|
6a2434b56c
|
compiler: fix low-level-ir test on PowerPC
|
2009-10-19 05:03:02 -05:00 |
Slava Pestov
|
2d5cdd19ec
|
compiler: on PPC, ANDI, ORI and XORI instructions take an unsigned 16-bit immediate, unlike ADDI, SUBI and MULLI which take a signed 16-bit immediate. The code generator was not aware of this, and so for example '[ >fixnum -16 bitand ]' would generate incorrect code. Split up small-enough? hook into immediate-arithmetic? and immediate-bitwise? and update value numbering to be aware of this. Fixes classes.struct bitfields test failure
|
2009-10-19 04:58:29 -05:00 |
Joe Groff
|
448ef2f1d5
|
fix unsigned vector unpack
|
2009-10-16 14:25:33 -05:00 |
Slava Pestov
|
107c96f642
|
vm: code heap compaction at runtime using compact-gc primitive
|
2009-10-16 11:39:35 -05:00 |
Slava Pestov
|
d48c72a274
|
compiler.cfg: fix unit tests
|
2009-10-15 06:01:46 -05:00 |
Slava Pestov
|
7d97c19227
|
compiler: tweak ##write-barrier-imm
|
2009-10-15 02:40:23 -05:00 |
Slava Pestov
|
38d120f92e
|
vm: rt-vm relocation now supports accessing a field directly
|
2009-10-14 19:24:23 -05:00 |
Slava Pestov
|
1ce39963fd
|
Working on adding support for the new write barrier to optimized code
|
2009-10-14 02:06:01 -05:00 |
Joe Groff
|
97ab9dc4ab
|
only emit ##alien-vector/##set-alien-vector insns if the rep is available
|
2009-10-10 12:53:10 -05:00 |
Joe Groff
|
d9002127fa
|
have vshuffle accept simd-128 variable byte shuffles
|
2009-10-10 11:30:11 -05:00 |
Joe Groff
|
6816adfeb3
|
Merge branch 'master' of git://factorcode.org/git/factor
|
2009-10-10 09:17:01 -05:00 |
Slava Pestov
|
366c341c5f
|
compiler.tree.propagation.branches: fix live-branches computation for #dispatch nodes
|
2009-10-10 00:23:50 -05:00 |
Joe Groff
|
3bc097f6ff
|
rename ##shuffle-vector to ##shuffle-vector-imm, and add a new ##shuffle-vector for dynamic shuffles. have vshuffle use ##shuffle-vector to do word and byte shuffles on x86
|
2009-10-09 21:26:27 -05:00 |
Joe Groff
|
471c86a110
|
generate better code for vabs when instruction isn't available instead of using software fallback (-0.0 andn for floats, x > 0 ? x : -x for signed ints, nop for unsigned ints)
|
2009-10-09 14:24:55 -05:00 |
Joe Groff
|
01f5d392be
|
implement vneg as an intrinsic in terms of load -0, subtract
|
2009-10-09 13:16:39 -05:00 |
Slava Pestov
|
61e1854ca5
|
compiler.codegen: fix failing tests
|
2009-10-09 09:44:09 -05:00 |
Slava Pestov
|
4262781be2
|
Merge branch 'bitfields' of git://factorcode.org/git/factor into bitfields
|
2009-10-09 04:12:34 -05:00 |
Daniel Ehrenberg
|
bb93543054
|
Another identity in value numbering for bitfields
|
2009-10-08 15:20:42 -05:00 |
Slava Pestov
|
c5979615b7
|
Merge branch 'master' into new_gc
|
2009-10-08 02:29:24 -05:00 |
Daniel Ehrenberg
|
2db25b937e
|
Doing constant folding on ##neg and ##not in value numbering
|
2009-10-08 01:57:54 -05:00 |
Daniel Ehrenberg
|
eb31589092
|
Adding identity to propagation to remove some redundant bitands
|
2009-10-08 00:59:15 -05:00 |
Joe Groff
|
dd691a61e8
|
break vector compare intrinsics into %compare, %or, and %not instructions that map directly to cpu instructions
|
2009-10-07 15:27:03 -05:00 |
Joe Groff
|
f2c9eb79e2
|
decompose %unpack-vector-head/tail into %compare-vector/%merge-vector-head/tail or %tail>head-vector/%unpack-vector-head insns when there isn't an actual unpack insn; get rid of fake x86 implementations
|
2009-10-07 14:09:46 -05:00 |
Joe Groff
|
fd6f370119
|
typo in convert-to-fill-vector?
|
2009-10-07 12:53:10 -05:00 |
Joe Groff
|
47cfb7d3a5
|
fix ##load-constant/##scalar>vector folding when constant is a fixnum
|
2009-10-07 12:46:08 -05:00 |
Joe Groff
|
ea051063a4
|
convert all-ones vector ##load-reference/##load-constant to a ##fill-vector insn
|
2009-10-07 12:35:21 -05:00 |
Joe Groff
|
34def34481
|
don't generate a ##not-vector instruction if the cpu doesn't have one; instead, fall back to a ##fill-vector/##xor-vector combo. get rid of pretend %not-vector in cpu.x86
|
2009-10-07 11:59:36 -05:00 |
Joe Groff
|
879fe9a665
|
fix x86 %unpack-vector insns
|
2009-10-06 20:38:51 -05:00 |
Joe Groff
|
785f8620fd
|
glue conversion intrinsics to instructions
|
2009-10-06 20:13:38 -05:00 |
Slava Pestov
|
697e2342d0
|
vm: put code block owner directly in the header, instead of as the first entry in the literal table. Reduces x86-64 image size by ~700kb, also eliminates separate 'strip' set of staging images from deploy tool
|
2009-10-06 06:25:07 -05:00 |
Joe Groff
|
fb8eeb6065
|
Merge branch 'master' of git://factorcode.org/git/factor
|
2009-10-05 22:34:41 -05:00 |
Joe Groff
|
529c444e32
|
add insns for vector pack, unpack, integer>float, and float>integer
|
2009-10-05 22:34:14 -05:00 |
Slava Pestov
|
55fe25ebd1
|
Merge branch 'master' of git://factorcode.org/git/factor
|
2009-10-05 18:22:09 -05:00 |
Slava Pestov
|
5b40fc6533
|
compiler.cfg.linear-scan: fix unit test
|
2009-10-05 18:21:58 -05:00 |
Joe Groff
|
fbe810fc3b
|
rename SIMD vmerge and kids to (vmerge), make new vmerge more generally useful
|
2009-10-05 17:55:39 -05:00 |
Slava Pestov
|
b4e36608da
|
compiler.cfg: remove _gc instruction, it doesn't need to exist, and change GC checks to ensure that the right amount of space is available instead of blindly checking for 1Kb
|
2009-10-05 05:27:49 -05:00 |
Joe Groff
|
0c9c3d4859
|
add %merge-vector-head and %merge-vector-tail instructions to back vmerge
|
2009-10-03 21:48:53 -05:00 |
Joe Groff
|
04bb03bb61
|
add intrinsics for v<=, v<, v=, v>, v>=, vunordered?
|
2009-10-03 11:29:34 -05:00 |
Joe Groff
|
4e024cbbc2
|
extend x86 %compare-vector to cover all comparison codes, sometimes stupidly for now
|
2009-10-02 23:19:56 -05:00 |
Joe Groff
|
38f413a8a6
|
add intrinsic for vnot/vbitnot
|
2009-10-02 20:04:28 -05:00 |
Doug Coleman
|
67167cf9ea
|
Merge branch 'docs' of git://github.com/klazuka/factor into klazuka
Conflicts:
basis/math/vectors/vectors-docs.factor
|
2009-10-02 15:58:45 -05:00 |
Joe Groff
|
aa3392e50f
|
implement vand, vor, vandn, and vxor as bitwise intrinsics for simd types
|
2009-10-02 14:17:01 -05:00 |
Keith Lazuka
|
405e5d015b
|
docs: change $subsection to $subsections
|
2009-10-02 12:15:48 -04:00 |
Slava Pestov
|
cb71fbf4fe
|
Fix compiler.cfg.value-numbering and math.matrices.simd unit tests
|
2009-10-02 02:32:35 -05:00 |
Slava Pestov
|
bcbdc9e0c8
|
Merge branch 'master' of git://factorcode.org/git/factor into improved-aa
|
2009-10-02 00:21:44 -05:00 |
Slava Pestov
|
fb09d67936
|
compiler.cfg.alias-analysis: fix ##compare where operands are copies
|
2009-10-01 23:54:19 -05:00 |
Slava Pestov
|
2a4475f85e
|
Fix alias analysis of a ##compare whose input is another ##compare
|
2009-10-01 23:20:05 -05:00 |
Joe Groff
|
53b265f682
|
Merge branch 'master' of git://factorcode.org/git/factor
Conflicts:
basis/compiler/codegen/codegen.factor
|
2009-10-01 23:14:16 -05:00 |