sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
5234 commits 2 branches 0 tags 204 MiB
Commit graph

2099 commits

Author SHA1 Message Date
Gabe Black
70542c8e61 X86: Make "Inst" the default format instead of WarnUnimpl for one byte opcodes. 
--HG--
extra : convert_revision : 591e67fc21f5b72977c5876e39f488494fda77c2
 2007-10-18 22:39:39 -07:00
Gabe Black
dc2e887f23 X86: Implement the in/out instructions. These will still need support from the TLB and memory system. 
--HG--
extra : convert_revision : a9503248ea9efca7e5247e4f2830967f428b8215
 2007-10-18 22:39:00 -07:00
Gabe Black
2bbc058c6c X86: Implement the LOOP instructions. 
--HG--
extra : convert_revision : 3ccd0565c83b6d9c9b63f9f7ac2b67839a2c714f
 2007-10-18 22:38:17 -07:00
Gabe Black
418b30602b X86: Attach the CMC instruction to the decoder. 
--HG--
extra : convert_revision : 909661062017c7640c343e80431eaf365e8fcf53
 2007-10-18 22:37:44 -07:00
Gabe Black
674b6436b0 X86: Implemented the jrcx instruction. 
--HG--
extra : convert_revision : d738015ff33449e55d8f1624c8467c1bba193e16
 2007-10-18 22:37:08 -07:00
Gabe Black
0ffb317ff9 X86: Make wrip sign extend its second operand. 
--HG--
extra : convert_revision : 2531af8b442ea5aaefccd7a7999c7720489edc36
 2007-10-18 22:36:36 -07:00
Ali Saidi
8351660273 CPU: Use the ThreadContext cpu id instead of the params cpu id in all cases. 
--HG--
extra : convert_revision : 6d025764682181b1f67df3b1d8d1d59099136df7
 2007-10-18 13:15:08 -04:00
Gabe Black
54466a31c3 Make the process objects use the Params structs in their constructors, and use a limit to check if access are on the stack. 
--HG--
extra : convert_revision : af40a7acf424c4c4f62d0d76db1001a714ae0474
 2007-10-16 18:04:01 -07:00
Gabe Black
9660a0a552 Merge with head 
--HG--
extra : convert_revision : 490f9909469751a6cdaf6669e4cd4589ce3a4093
 2007-10-12 20:10:57 -07:00
Gabe Black
ac27bc7878 Loader: Identify sections based on virtual addresses, and set the LoadAddrMask correctly for x86. 
--HG--
extra : convert_revision : efa6cf42f7e69074c645dfcac335a3edf0941389
 2007-10-12 20:10:10 -07:00
Gabe Black
0d6383b69e X86: Added some new versions of MOV and a new argument type tag. 
--HG--
extra : convert_revision : e21b2062d68baa983c7c631b3e1fe3149de56427
 2007-10-12 20:08:12 -07:00
Gabe Black
d82d3bbda5 X86: Implemented LODS. 
--HG--
extra : convert_revision : 4bd8f15bbc25f5dce16ea0504ad6dd21805fa56a
 2007-10-12 20:07:28 -07:00
Gabe Black
9498e536c0 X86: Implement MSR reads and writes and the wrsmr and rdmsr instructions. 
There are no priviledge checks, so these instructions will all work in all
modes.

--HG--
extra : convert_revision : ff893eb569313d8aecbfffb47bcbd1c2d65cd393
 2007-10-12 16:37:55 -07:00
Gabe Black
a76f734d0b X86: Get rid of BasicOperate format which wasn't used and referred to SparcStaticInst 
--HG--
extra : convert_revision : 5d2eac9a4b3f0fe5e3c3554d91acf8fee368c9dc
 2007-10-09 17:21:04 -07:00
Gabe Black
8ecea59092 X86: Get rid of stray Sparc DPRINTF 
--HG--
extra : convert_revision : d98b2d95448cab4e689d01ceedaa6ad46f9ffc09
 2007-10-09 17:20:23 -07:00
Gabe Black
f6e5b92d63 ELF Loader: Use physical addresses instead of virtual ones. 
This works in SE mode because the virtual and physical addresses specified for
segments are the same. In Alpha, the LoadAddrMask is still necessary because
the virtual and physical addresses are the same and apparently rely on the
super page mechanism. All of the regressions pass.

--HG--
extra : convert_revision : 45e49dec5002d64e541bc466c61a0f304af29ea5
 2007-10-09 13:12:04 -07:00
Gabe Black
8858b0b667 X86: Make x86 initialize more state. 
--HG--
extra : convert_revision : a55866efd339ae795da4072c070918bf419b07fa
 2007-10-07 18:20:51 -07:00
Gabe Black
a19c212757 X86: Work on the x86 tlb. 
--HG--
extra : convert_revision : a08a5cb049a6030ba9fd56a89383d56026238dbf
 2007-10-07 18:18:39 -07:00
Gabe Black
cd36c69a4d X86: Make faults maintain an error code which gets pushed on the stack. 
--HG--
extra : convert_revision : 7576f8cfaec9ddfb65e6ba7a6f64a5f453a42069
 2007-10-07 18:17:52 -07:00
Gabe Black
efbff349a9 X86: Significantly filled out misc regs. 
--HG--
extra : convert_revision : 4c53be6568134d65e57f5411df986fd9a89e82c9
 2007-10-07 18:16:00 -07:00
Gabe Black
999328f5ad X86: Make sure there are fewer spurious differences between instructions for caching purposes. 
--HG--
extra : convert_revision : 7e6be1c42f28f92d9e8b47169e683827bb3f4aaf
 2007-10-07 18:14:48 -07:00
Gabe Black
d53552355b BitUnion: Fix some types in the bitunion classes. 
--HG--
extra : convert_revision : 1c003f9fc9ef3a57c9199d692d172e747581f383
 2007-10-07 18:12:10 -07:00
Gabe Black
63a6d7376b X86: Make initCPU and startupCPU do something basic. 
--HG--
extra : convert_revision : 1a04f4402f4f31e4e5cd482c7983d853fe117df5
 2007-10-07 18:10:42 -07:00
Gabe Black
304e4c932a X86: Make the Interrupts class complain less. 
--HG--
extra : convert_revision : 81d9544e85c90139704ffe4a117983df4bfa3bcd
 2007-10-07 18:08:17 -07:00
Gabe Black
847a18ad48 X86: Adjust the config scripts for x86 fs. 
--HG--
extra : convert_revision : 36ed22b50066f54be0e51c3419babc07dd218e10
 2007-10-07 17:52:36 -07:00
Gabe Black
e540c37282 X86: Make an x86 system object. 
--HG--
extra : convert_revision : 590a4c29cb9b943a2d8c3a97c5fdfbabb658ac45
 2007-10-07 17:48:36 -07:00
Gabe Black
8fe672551e X86: Make an x86 platform object. 
--HG--
extra : convert_revision : 7d64d3e78960f3bb937579f5d10937bed5f197be
 2007-10-07 17:48:06 -07:00
Gabe Black
22196f8885 X86: X86 FS compile fix. 
--HG--
extra : convert_revision : bedd4cbab570d4ae84af9e8ead8f61db5c3c01dc
 2007-10-07 17:46:56 -07:00
Gabe Black
bd5a88ba43 Merge with head. 
--HG--
extra : convert_revision : aa1969b60044f8ed88e689bdd25eeded2b1105ec
 2007-10-04 12:35:35 -07:00
Gabe Black
e1516aefbb X86: Fix the PageShift constant in isa_traits.hh (I thought I alread did this?) 
--HG--
extra : convert_revision : bdc51a66e4fdf4b0a51b5c774ca7372a00a57269
 2007-10-04 12:34:29 -07:00
Gabe Black
2848ef6696 SPARC: Make software trap 3 flush the register windows like the ABI specifies. 
--HG--
extra : convert_revision : 8ff43617b56dcca5783d6cc490f87140fc20a36d
 2007-10-04 12:24:16 -07:00
Gabe Black
50e2d20cb8 Merge with head. 
--HG--
extra : convert_revision : 1aa0e4569a7c10e6a395c2c951ac29275b5bcf59
 2007-10-02 23:03:38 -07:00
Gabe Black
c2d60abf52 X86: Distinguish between the rep and repe prefixes. 
STOS and MOVS only accept the rep prefix which always loops until rcx becomes
0. The other string instructions accept repe (same encoding as rep) and repne
which also check the condition code flags each iteration.

--HG--
extra : convert_revision : 544149f640302070810fb53e53bfeb0e87160ffc
 2007-10-02 23:02:18 -07:00
Gabe Black
504f90f763 X86: Start implementing the x86 tlb which will handle segmentation permission and limit checks and paging. 
--HG--
extra : convert_revision : 6072f7d9eecbaa066d39d6da7f0180ea4a2615af
 2007-10-02 23:00:37 -07:00
Gabe Black
f4a932a6b3 X86: Fix places where movfp was used incorrectly. 
--HG--
extra : convert_revision : a6b5688eaa53d2f6675df1be193726641e558d37
 2007-10-02 22:58:48 -07:00
Gabe Black
06d2d54b57 X86: Fix the movfp microop. 
--HG--
extra : convert_revision : 23829782a2802a97a05e4dfdb5dd38fbe4165a90
 2007-10-02 22:58:04 -07:00
Gabe Black
3e644b48bb X86: Fix x87 floating point stack register indexing. 
--HG--
extra : convert_revision : b515ec20cbfc50b38aa7da6cf4d465acf9054c08
 2007-10-02 22:57:33 -07:00
Gabe Black
a56c651980 Predecoder: Clear out predecoder state on an ITLB fault. 
--HG--
extra : convert_revision : 68f8ff778dbd28ade5070edf5a7d662e7bf0045a
 2007-10-02 22:21:38 -07:00
Gabe Black
4049c9f76a X86: Put ldst into the microcode (the earlier changeset didn't really). 
Also clean things up as much as possible so that faulting won't break an
instruction. More microops which verify addresses are needed.

--HG--
extra : convert_revision : 7c6050cb4798d287fe7d3cc4bb8c20dfa40ad2be
 2007-10-02 22:19:53 -07:00
Gabe Black
7c521db9de X86: Implement the ldst microop and put it in existing microcode where appropriate. 
--HG--
extra : convert_revision : f08bd725d07a501bb7a0ce91590b5d37db99c6f3
 2007-10-02 22:08:09 -07:00
Gabe Black
683d6d46f6 X86: Fix up the microcode for the FST and FSTP instructions. 
--HG--
extra : convert_revision : ad68633e9b7eab425593acb20cf242bf98c2b642
 2007-10-02 22:06:59 -07:00
Gabe Black
b831f7409b X86: Get rid of a hack for ruflag which is no longer necessary. 
--HG--
extra : convert_revision : 1bb60c9ddb483aead2af0201bbda938cc6d3f7cb
 2007-10-02 22:05:50 -07:00
Gabe Black
efb309525a X86: Allow logic instructions to set ECF as well as CF. 
--HG--
extra : convert_revision : 6ac20f069c86c23a8d443a7127afd6015166c00d
 2007-10-02 22:05:10 -07:00
Gabe Black
65c247f21f X86: Add classes for the actual x86 faults. 
--HG--
extra : convert_revision : bc060a01b5415551b335ca68ccbf126333ae20b0
 2007-10-02 22:04:20 -07:00
Gabe Black
7d78f1b41c X86: Hook in another version of the XCHG instruction. 
--HG--
extra : convert_revision : 7b6f9cd2f59443622f6963dfee454175322c0ef5
 2007-10-02 22:03:38 -07:00
Gabe Black
66a08f7ba4 X86: Implement MOVS 
--HG--
extra : convert_revision : 29147e1b86f7c54ce9b5ff68001725802c665fc0
 2007-10-02 22:02:58 -07:00
Gabe Black
fea7165b55 X86: Implement STOS. 
--HG--
extra : convert_revision : 95f3bf185f07fe644d6ab96bbb6e598e406b92f4
 2007-10-02 22:02:30 -07:00
Gabe Black
7571e8346d CPU: Make the cpuid parameter get set in SE mode as well. 
--HG--
extra : convert_revision : bc47206acb683ebaaa31f57af79b4b8db64e4d31
 2007-10-02 18:33:57 -07:00
Gabe Black
8ca7feb726 Remote GDB: Turn on remote gdb in SE mode. 
--HG--
extra : convert_revision : e17eb629071edd0dbcb09dd6a6a2220d2c83d33f
 2007-10-02 18:26:27 -07:00
Gabe Black
988cdb49f2 CPU: Make the cpus check the pc event queues in SE mode. 
--HG--
extra : convert_revision : 9dc4ea136c3c3f87a73d55e91bc4aae4eba70464
 2007-10-02 18:25:37 -07:00
Gabe Black
48041fdc53 SPARC,Remote GDB: Flesh out the acc function for SE mode. 
--HG--
extra : convert_revision : eada066ab64701b5c53e7351dfffbdc0e0d4f344
 2007-10-02 18:25:10 -07:00
Gabe Black
1c83418b14 SPARC,Remote GDB: Fix an accounting bug in the remote gdb stuff. 
--HG--
extra : convert_revision : f6f0986211c442ac94da315e344a8f54d4d58c8a
 2007-10-02 18:24:24 -07:00
Gabe Black
5db7125317 Remote GDB: Get rid of an unwanted delete in SE. 
--HG--
extra : convert_revision : 7531ba87893a8ebff3863adb846b382d07a1d18d
 2007-10-02 18:23:11 -07:00
Gabe Black
3eeda8008d CPU: Make sure the system parameter gets set in the cpu builders. Other parameters need to be fixed as well. 
--HG--
extra : convert_revision : 0401970a79855ee0a96eb29305346ce07b5c98ea
 2007-10-02 18:22:36 -07:00
Ali Saidi
0acf891c32 CPU: fix sparc_fs booting with SimpleTimingCPU. 
--HG--
extra : convert_revision : 3d95f6daa7f0e8e376d1a880f64c056619263885
 2007-10-01 02:55:27 -04:00
Ali Saidi
d2a4f595d6 Update stats for quiesced cycles 
--HG--
extra : convert_revision : 703ba58f156c9f2677b020f05d36bc1e3ae0b9e5
 2007-09-28 13:22:14 -04:00
Ali Saidi
d325f49b70 Rename cycles() function to ticks() 
--HG--
extra : convert_revision : 790eddb793d4f5ba35813d001037bd8601bd76a5
 2007-09-28 13:21:52 -04:00
Ali Saidi
887cd6a273 Update statistics to use cycles properly instead of ticks 
--HG--
extra : convert_revision : 62911280b631ef24720f9ce701d1c19a9b8a9784
 2007-09-28 13:21:30 -04:00
Gabe Black
58c448ced5 Condition Codes: Fix the findParity function. 
--HG--
extra : convert_revision : 37520ed12f55f6b8d9daedca9947eaa2eb8d7cc7
 2007-09-25 20:26:10 -07:00
Gabe Black
2dd65dc254 Merge with head. 
--HG--
extra : convert_revision : f331b9cbd82086d63d4f35e18f9e08466c016225
 2007-09-25 20:11:41 -07:00
Gabe Black
25a9b6ea5e SPARC: Remove parameter that was only ever set to one value. 
--HG--
extra : convert_revision : 3c22e576d95bdc7566bbce9b92cf2a6ff153a66f
 2007-09-25 20:11:03 -07:00
Gabe Black
e735001d54 SPARC: Remove some redundant code from some of the fp instructions. 
--HG--
extra : convert_revision : 68b0341ae7a367b84c44081f9a3d6d0bc6631649
 2007-09-25 20:10:04 -07:00
Gabe Black
306b5c6b5b SPARC: Clean up of privileged instructions. 
--HG--
extra : convert_revision : 1fb055a7d186a3e9dff46f1c1b46bad6bcd00562
 2007-09-25 20:09:25 -07:00
Gabe Black
b896ad584b SPARC: Long overdue cleanup of the condition code handlers. 
--HG--
extra : convert_revision : ddc53a622a8f908fa48788f3b570f33fcfc25fff
 2007-09-25 20:08:34 -07:00
Gabe Black
25b4874664 Condition Codes: Fix type error. 
--HG--
extra : convert_revision : 99f6c232cc421c6f741a8a11c029285e599eb183
 2007-09-25 20:07:06 -07:00
Gabe Black
8d53fea210 SPARC: Clean up the branch instructions a bit. 
--HG--
extra : convert_revision : 93d5cc68e4a327ee0492eeed7f3b56e98d2d83bb
 2007-09-25 20:05:11 -07:00
Gabe Black
9ef0f6a7f1 Loader: Load all segments of an elf, rather than just the "text" and "data". 
--HG--
extra : convert_revision : b28bb9ac5cde72878e948d64f629de6e4b42c2e8
 2007-09-25 20:03:51 -07:00
Gabe Black
85d46ce470 Loader: Only complain about TLS sections if you're using Alpha. 
--HG--
extra : convert_revision : 125d19ad3fa1847752e455fa248ca3b2a55a2067
 2007-09-25 20:02:30 -07:00
Gabe Black
032a30f345 SPARC: Fix a stupid mistake which was breaking the SPARC regressions. 
--HG--
extra : convert_revision : 34a11df0d467ea249211dd3aba86bc8d2aea45de
 2007-09-25 20:00:46 -07:00
Gabe Black
b3c6f32543 X86: Fix for uninitialized variables in stacktrace code. 
--HG--
extra : convert_revision : d19a03d8c14eb93a99f2c1838a9caa1286804c81
 2007-09-25 14:44:12 -07:00
Gabe Black
418ddf43e6 X86: Get X86_FS to compile. 
--HG--
extra : convert_revision : fb973bcf13648876d5691231845dd47a2be50f01
 2007-09-24 17:39:56 -07:00
Gabe Black
dd277e0d8f SPARC: Fix linking error from new flattenFloatIndex function. 
--HG--
extra : convert_revision : 5260f33336e3a9d5e3592b784458e243157f17e3
 2007-09-19 19:08:42 -07:00
Gabe Black
3cd95a2748 X86: Implement the fld, fst, and fstp instructions. 
--HG--
extra : convert_revision : 7dd274bdc3c34839c17d9012a745d7c95dfcfdd8
 2007-09-19 18:28:34 -07:00
Gabe Black
a75b6f5106 X86: Move the fp microops to their own file with their own base classes in C++ and python. 
--HG--
extra : convert_revision : 9cd223f2005adb36fea2bb56fa39793a58ec958c
 2007-09-19 18:27:55 -07:00
Gabe Black
f3f3747431 X86: Put in the foundation for x87 stack based fp registers. 
--HG--
extra : convert_revision : 940f92efd4a9dc59106e991cc6d9836861ab69de
 2007-09-19 18:26:42 -07:00
Gabe Black
a54ae9f92b X86: Put in stubs for x87, 64 bit and 128 bit SIMD instruction microcode. 
--HG--
rename : src/arch/x86/isa/insts/sse/__init__.py => src/arch/x86/isa/insts/simd128/__init__.py
extra : convert_revision : efb4405aebaa4a04f33572e7d078ceca45872d9c
 2007-09-19 18:25:17 -07:00
Gabe Black
a1912df360 X86: Enable the rename system call. 
--HG--
extra : convert_revision : bc4a3b5b5ce8e17f632e65ce89df91e2b50e1274
 2007-09-19 18:24:11 -07:00
Gabe Black
bdc0261eb5 X86: Enable the unlink system call. 
--HG--
extra : convert_revision : 4230a13fdb652a87271f8d2ac9ead96cd2af07a5
 2007-09-19 18:23:35 -07:00
Steve Reinhardt
76c4c5fabc mem: clean up bus/cache DPRINTFs a bit 
Not so much noise on failed sends, and more complete
info when grepping a trace using an address.

--HG--
extra : convert_revision : 05a8261c9452072ca08b906200c6322b33e2b9f1
 2007-09-16 16:46:38 -07:00
Gabe Black
4a4aa59632 Merge with head. 
--HG--
extra : convert_revision : 22aafb1cead3f584e64c188dc8eb45e271f4e7e9
 2007-09-13 16:36:25 -07:00
Gabe Black
bbc8a40857 X86: Fix how ECF is computed in genFlags, and get rid of some duplicate code. 
--HG--
extra : convert_revision : f86330a5a9fea782ee63aaa18ca964fb6f9cef0b
 2007-09-13 16:35:41 -07:00
Gabe Black
534c6a800a X86: Make the shift and rotate instructions set the carry flag(s) and overflow flags like they're supposed to. 
--HG--
extra : convert_revision : c0523a5bbf53375ce979ca7d98a95e465be66fbe
 2007-09-13 16:35:20 -07:00
Gabe Black
f7b6230d99 X86: Total overhaul of the division instructions and microops. 
--HG--
extra : convert_revision : 303ea45f69f7805361ad877fe6bb43fbc3dfd7a6
 2007-09-13 16:34:46 -07:00
Ali Saidi
e282d9601c Syscall Emulation: Add stat64 syscall. 
Patch submitted by: Jonas Diemer [diemer (a) ida.ing.tu-bs.de]

--HG--
extra : convert_revision : 07638c05bb3f79aacce49457bbb8c17d0a3a7238
 2007-09-13 12:30:12 -04:00
Ali Saidi
5f187e592e Devices: More fixes to Intel NIC Model. 
--HG--
extra : convert_revision : 14306d3cd79bbef7decdf2fd370ed7e7f2b10a93
 2007-09-12 15:24:23 -04:00
Ali Saidi
19fbdcd30b Loader: Error if a TLS section is found in the binary. 
--HG--
extra : convert_revision : d763c0382f3cbcc9786510f5a8e521ec9d55eff1
 2007-09-11 00:01:24 -04:00
Gabe Black
0f57b407a3 X86: Make the isa parser run if any of the microcode files change. 
--HG--
extra : convert_revision : 7f6d07de7e0d728a9333fb46c953dbe6cb04e600
 2007-09-10 16:49:07 -07:00
Gabe Black
87408d5ad2 Fix for leaving EXTRAS blank 
Apparently env['EXTRAS'] will return an empty string if not set. split will
then split it into an empty string, and normalize will turn "" into ".".

--HG--
extra : convert_revision : f79efebb129fdd65161fcf4d4582c2a8541aeacd
 2007-09-10 16:42:41 -07:00
Gabe Black
8f724a8b96 Normalize the path pathed in through EXTRAS so it won't break with a trailing slash. 
--HG--
extra : convert_revision : c14e2c6d97b5bcb491b91eeb4e7dc04d1cc35475
 2007-09-10 12:48:06 -07:00
Gabe Black
22a57562cd Remove redundant endian.hh and use byteswap.hh in its place. 
--HG--
extra : convert_revision : 5be1a5ba20d69d696d3974df147c2f219414c0b2
 2007-09-10 11:02:50 -07:00
Gabe Black
8e7bca8b36 X86: Move a comment to be next to the code it describes. 
--HG--
extra : convert_revision : c384391175babb7cfdd3885ae9d9f1a9405ea44f
 2007-09-10 11:01:52 -07:00
Gabe Black
3e65e1d0e0 Merge with head. 
--HG--
extra : convert_revision : 4fc5f595b23f72c0825d62f21efab46ed1db835b
 2007-09-06 16:32:03 -07:00
Gabe Black
e4c0171356 X86: Rework the multiplication microops so that they work like they would in the patent. 
--HG--
extra : convert_revision : 6fcf5dee440288d8bf92f6c5c2f97ef019975536
 2007-09-06 16:27:28 -07:00
Gabe Black
7f079149f1 X86: Make signed multiplication do something different from unsigned. 
--HG--
extra : convert_revision : 333c4a3464d708d4d8cea88931259ab96c2f75ed
 2007-09-06 16:25:29 -07:00
Gabe Black
5052e2cb10 X86: Make signed versions of partial register values available to microops. 
--HG--
extra : convert_revision : c820d1250f505911a341ced42d4f73796ea77f87
 2007-09-06 16:22:08 -07:00
Gabe Black
832ef7412b X86: Correct how the hi portion of a product is computed. 
--HG--
extra : convert_revision : 1f503e1cae0374e62e6254e8073e903adc29d067
 2007-09-06 16:20:12 -07:00
Gabe Black
389abade01 X86: Add a square root microop and the SSE sqrt instruction. 
--HG--
extra : convert_revision : ddc6e7e95111189d43f75bf84cd3d82433d982b3
 2007-09-06 16:18:34 -07:00
Gabe Black
4478487c37 X86: Add SSE comparison instructions and microops and move some FP microops to be with the other ones. 
--HG--
extra : convert_revision : ee0b5acde08d12c51a5282efb58d1ac72e0779af
 2007-09-06 16:09:28 -07:00
Ali Saidi
bf7c01d43d Bus: Fix drain code; old method could return 1 in atomic mode and never call de->process(). 
--HG--
extra : convert_revision : 35990e5eaf93f7a95a0ec72e9f92034a042def3e
 2007-09-05 17:12:41 -04:00
Gabe Black
57da059415 Merge with head. 
--HG--
extra : convert_revision : 19bea7995285eeb7e277d3064f427429ade2bcb8
 2007-09-04 23:46:08 -07:00