Quick Links:

Releases | Mailing Lists | Source Control | Issue Tracker | Regression Tests

Merge Status of MRP changesets

Almost all of the changes in MRP are potentially useful for Jikes RVM. This page lists the merge status for the changesets in MRP.

Commit ids refer to the codehaus GitHub MRP repository mirror and not to the one at Google Code (the commit ids are different!).

The first MRP-specific commit is 870e57d18ce7c99e8d8c00b5e0adfe7b2f953280 (Set up trunk directory) from Thu Feb 26 19:20:50 2009 +0000

All MRP commits up until 80f910701d9597f710a81f1316337363f8948868 (Remove unnecessary explicit scan of JNIFunctions, these are never recompiled so don’t need scanning.) from Sat Jun 6 21:26:13 2009 +0100 have been processed and entered in the tables below.

Completely merged Changesets (ordered from earliest to latest MRP commit)

MRP Commit Notes Jikes RVM commits
5ff473b86fd7f4144cabd757d3c046ce3f45e42e x64, bootimageRunner printout cleanup, remove APR. 0cf9dbf84e254b2f01f013b233008caea392f507 (libvm.c SIZE_OF_POINTER changes) 2a61778479e8ab168dbe3901b7b823d362086b2b (bootimage runner printouts)
7f3b83f668ea10cab67ea21d5e79d7bbba0df20d Remove unused methods from FileSystem class 2f1b6c69b687f65e025891eff8cf4d647a7e3649
caa5090e4387f4df056a51194975a78c01cbdcbf Use SIZE_OF_POINTER in libvm.c 0cf9dbf84e254b2f01f013b233008caea392f507
f1be1b84568d93b156996697b91b4a33f6cb8177 Cleanup after removal of FileSystem methods e94054d9a5d81c30fe1fbb82d51f0030589a8799
df8d479d65a2e31d768e9555ff6cc58e18290116 Deletion of cmdLine.h, other changes weren’t applicable to the RVM at the merge point a780429ac46044124ca404482c4c192ee269a3d2
90be4471c1650641b02b3a350063778484d27a3c perfCtr changes aren’t necessary, rest has been merged a780429ac46044124ca404482c4c192ee269a3d2 (Moving of contents of cmdLine.h)
2d28eef3457c70449a844687adcd298b109d3662 (Moving of findMappable() to sysMemory.cpp)
d69f1046385597d6ea8d1d9744e83a7867ec4e73 (Removal of assert)
46462a1414c2dfc2b89d52b56ab61410ec31db61 (Rename of bootimage runner to bootloader)
7294fbb209cc9e3a5e81d9a6f6fa8f7825423b76 Move of JNI bootloader routines into a separate directy a4cc0ab55a23cd1a132405f8f9454c9ec74ef781 (move of JNI bootloader routines into a separate directory)
c947a46db808f31eacdb158bd37d6de9c2f98253 Move of JNI bootloader routines into a separate directy, update of bootloader path in build.xml for renaming of bootimage runner to bootloader 46462a1414c2dfc2b89d52b56ab61410ec31db61 (renaming of bootimage runner to bootloader)
a4cc0ab55a23cd1a132405f8f9454c9ec74ef781 (move of JNI bootloader routines into a separate directory)
283ea3ca775c8926ac615b8bf6e08761cec94526 (introduction of -DRVM_FOR_IA32)
792bfdcfa96368780e982119081950c00b97fb58 Introduction of informative printouts in build.xml, build.xml portability improvements 8aea28a807abdda44c4a3c12258431a612406874 (use <arg path> instead of <arg value>)
aafe6a7a47d75d2c5a2f6c7d70cb0da5e6179a13 (informative printouts)
d82332a1d872d379d6ef8249e2779378fb90bd35 (portability improvements)
c9ed392ace7d7f1118a88cd2e682f356aa5144ee portability changes and printouts have been merged, Harmony fixes are not needed, sysMalloc/sysFree is not needed because Jikes RVM uses checkFree/checkMalloc aafe6a7a47d75d2c5a2f6c7d70cb0da5e6179a13 (informative printouts)
d82332a1d872d379d6ef8249e2779378fb90bd35 (portability improvements)
d1bb94992e15bf6f74b320d96d131403e75d329e migration from C++ to C, part 1 e56e854eca18ca3af648596ca27aa1621f1f34c6 (Renaming of RunBootimage.h to bootloader.h)
597db5166df1923fb6418fff693799f00f9a1cb3 (migration of bootloader to C)
2992187b81dff065185e28cb11aa3457c100561b conversion of read and write methods to use endless loops merged, IA32 libvm.c printout changes merged, removal of disassembler files merged, migration to C merged a10d8ac8ccce11b9901c9ee6630507eb00eb523b (endless loop instead of gotos and labels)
189a5647ca949a3f3fca774dcde83bfd6bd51f0e (Use printout macros from sys.h in IA32 libvm.c)
7a540b94a989b9aa8b1bd30eee8f13f453cd529d (removal of IA32 disassembler)
597db5166df1923fb6418fff693799f00f9a1cb3 (migration of bootloader to C)
bdbb7bdfdfc1616eed3d217e5dc0d2596299865c use double instead of long double when parsing memory size 7a59b392b3661189e5c3278939da1d6044c55566
11ea6da11437da1edc35822ea2884bda00abc3d4 add more debug output for some SysCalls 17b363469946e1e83e927220043b1565f00ab5d5
ce1547852843e99d24135303b3055595c5b0c226 Reintroduction of getInstructionFollowing for IA32 7a540b94a989b9aa8b1bd30eee8f13f453cd529d (implement getInstructionFollowing based on MRP code)
85a2c78266ab3121cb1b49f4fd3a8369cf685563 getInstructionFollowing, refactorings to remove initBootRecord.c merged, removal of libvm (part 1) 7a540b94a989b9aa8b1bd30eee8f13f453cd529d (getInstructionFollowing changes)
4fe011e460d9e7c7e0b7a86c2a31d9bd8a7a9609 (refactorings to remove need for initBootRecord.c)
65de872ef87f1adc473de8478463dd244c360a3d (move parse_memory size)
a8306483882525f6f7ab49fcde43ba3510773480 (move __SIZEOF_POINTER__ definition)
ba76b741d3fe11033b0ab80cc4c06112b0ef0baa (terminate the VM when allocation with malloc or calloc fails)
be8e2da46d8bcc216fdc6cf6fc75332761b0ed31 (fixes for printouts in sysThread.c)
4788d9c0cb3bf80267aa9878ed5ab0286430c0e2 (removal of libvm)
0d8544113769abcfb54e116339b5311ad79e745e PowerPC changes superseded by code in move to C in the Jikes RVM, removal of libvm merged later 597db5166df1923fb6418fff693799f00f9a1cb3 (migration of bootloader to C)
4788d9c0cb3bf80267aa9878ed5ab0286430c0e2 (removal of libvm)
047161ca45272dff9cd3601bdb2957cfd98e230b deletion of unused files 4fe011e460d9e7c7e0b7a86c2a31d9bd8a7a9609 (removal of initBootRecord.c)
The other files have been removed in later commits
047161ca45272dff9cd3601bdb2957cfd98e230b remove unused files after libvm removal 4788d9c0cb3bf80267aa9878ed5ab0286430c0e2 (removal of libvm)
338c28f8da47dabdb7bae60c21d81fef34809783 fix for IA32 bootloader thread code 4788d9c0cb3bf80267aa9878ed5ab0286430c0e2 (removal of libvm)
ae7d0649fa4f4aab31bf9819e5044130722a871c Checkstyle fix 4788d9c0cb3bf80267aa9878ed5ab0286430c0e2 (removal of libvm)
e2d03c9eaaab2e112107e2c545102799d1fe3e72 bugfixes for mapImageFile and main in main.c, Harmony fixes which we won’t merge 4788d9c0cb3bf80267aa9878ed5ab0286430c0e2 (removal of libvm)
d19a7989e5fb45e8a4542c6d97f880329a268767 Conversion of constants to offsets, BootImageCompiler changes 9b73037138c202edf6389c4f7d903079fc2ea620 (Conversion of constants to Offsets) d552b72f1c2b7b2c008b1773356e51784b9596c2 (GenArch_ia32 changes) 1d3030036a48b5ea2e610ca095ba2821cc47d186 (Make fields in BootimageCompiler final) 4645d488a5db5f5d52471e415bb9923cb50a3916 (Fail the bootimage build when exceptions are thrown during compilation)
460ec760a1998beb1c3aa26ccc4840298f00876a 32 bit fix for GenArch_ia32 changes d552b72f1c2b7b2c008b1773356e51784b9596c2
6784db17395a1e3c1410c2ab5bb5eb8c69f81ecd PowerPC changes superseded by code in move to C in the Jikes RVM, jvm.c changes merged 597db5166df1923fb6418fff693799f00f9a1cb3 (migration of bootloader to C)
be8e2da46d8bcc216fdc6cf6fc75332761b0ed31 (support MAP_ANON in addition to MAP_ANONYMOUS in sysMemory.c)
ef8d6ad3084c109a691abf28336ce5d3981fd6ec (formatting changes for jvm.c)
18b2944e3c27320b8ea1b78553d78a983cc9f660 add missing argument in usage of PRINTF macro 4788d9c0cb3bf80267aa9878ed5ab0286430c0e2 (removal of libvm)
50efc8345defb218a6e365788675d83a4046f070 bug fixes for PPC bootloader 4788d9c0cb3bf80267aa9878ed5ab0286430c0e2 (removal of libvm)
1b7dc59456ebbaf42ca9cfb3b8164396bab706d4 removal of Monitor class for the callback at plan exit 2414457cb5c7f7be1ac89cb723f08df4e717fff6
aff2f53807af1dabd1c5f404bc34c6c5f073c71c formatting ef8d6ad3084c109a691abf28336ce5d3981fd6ec (formatting changes for jvm.c)
67df59fcda76d61c760007842df1c26de4edb634 stricter checking of JNI version 69f0003bd6baee304935ee5a41d127026bf7f15e
9c6c49825d1d6589946315ef4600fa07bf93f330 Handle null Strings in getUTFChars 709613ccd2b690fb58b10319bbfd35f13fd43d43
7f471c06c692cce3ef4862a1b337260817a852d0 add missing newline 4788d9c0cb3bf80267aa9878ed5ab0286430c0e2 (removal of libvm)
ed4859cc413ef75c5e8ccf3c704c252a398e54dc Improve handling of empty stacks in dumpStack(..) fd50f51ba1237d31e02b38bc78d5baac6326b7c6
b6c53d291c022a71b4d8b16e2af6ee9bbef370dc
af2ab2b7604593e75a653177ebb2ad6c98fc1013
9db39bf2395ede289957dc3ebee1e1b8e1f951d4
44c5c9b33f16ec52ba12294ea7a1ce8842414738
Build fixes for Windows that are ok for other platforms; Windows-specific code and Harmony-specific changes haven’t been merged 8364c439e505fdde33016b67064b2b59a6661282
882a2e7d6ba450262e46ee2119be1e934aa3f0f7 MRP-1 / RVM-826 - was merged from MRP without attribution in the commit message 3624be6f51983f3f385c8031015c548c1cef006a
511d0148d432f93c7d7e6c89633ab693c26d5268 MRP-2 - was merged from MRP without attribution in the commit message d0d41f3d83bc2c03222b06af593d13dae8c72816
dd513368ef7d2a01a4a07f5c81d1d2336be3d227 update of cygwin host property files for migration to C merged, rest won’t be merged 597db5166df1923fb6418fff693799f00f9a1cb3 (migration of bootloader to C)
8924dfd8c52ea61b935b3980d7e3f16947e9f29a
588730dc268839db8eacda68a34a8c1164a5d14b
1c4796a23fea0be97f726a2001357ce2163c9cc9
4c46e343c082344a1eff3787c73a46ae981f41ae
a236f015f3cf9bfcbce2cb762442a0d76dcc6b09
8a8f58583ba4cf50adcbd326b43d4cabbdf412a8
c1d0370491c9175ebb8038195a2a5f5cb77ef985
5cc237a5a1592da2621b2be4fb84508a26d9a6b9
d4b64bcb93183295e94a3373abb21c1432a70a5d
5e21a316ff9bf64b30deb591f9954b3b093a9bda
10c2ef2bd90bdf96f004ed606e542c760717ef76
build system changes 4926f5569a22a937aa3dfc42cc3e8e113f2d140a
ef003a566ea9276ec4b9d79b568bc820beebaf34 removal of C++ properties from build.xml and x86-64-linux.properties merged, build system changes 597db5166df1923fb6418fff693799f00f9a1cb3 (migration of bootloader to C)
4926f5569a22a937aa3dfc42cc3e8e113f2d140a (build system changes)
00d06809c9e522cedadd24244cfac4da9944d707 Whitespace fix, was merged in one of the earlier merges from MRP Unknown
ec87572fd15e3ff4269290cc0bd02ad598781af2 Ensure that Me gets a valid value during start of the bootloader 5a885ba96731379b7434b3a62df3469ef6604ebd
7284e86ebd9cb4d0fc65383bcd04af9344207064 only use locking in RVMThread.traceback(..) when threading is initialized cad96adfc070472dfa2dcc3c8d0490818e2f8406
779dd723d47351add334e9c668782b29450b9af9
7256de33e834bf32d44c42a7ec22276296e54e6c
add missing JNIIMPORT statement, correct prototype 8a03305e62d3fa2fe5aef6cd6d01f2f70a478a6e
b0dc85eadbd9ec9db2f119b62e710c1cb37052af implement JNI_CreateJavaVM for RVM-565 a7f14945872e37d4a4ca4e338a9e7f7f5c400df6 (removal of fastExit)
913375e2fc957bda47e314a3ecf68568c2eeddf5 (implement JNI_CreateJavaVM for RVM-565)
44975de7ca72702e532aa535fad0a7fcdeec9245 clean ups for path separator e66741e3d8b0bedb5266c810a698aaf21f5685d1
c12d618640ee9c35b8325d86a75d0c083e0a2aa5
374f901cdc09a599001d1667a32559321642d927
8d40e38a87d5d57f433115f8b140823e22797c4c
introduce new condition operands (merged because emit_compare is used in x64 burs rules) 4cd32f743a07738477563b02eb02a5998357c9e2
6ec89c37015df1bd7045f5527f3b43ab7f06f85d make fields final 3b76e3c392d01237e5c193d45f4fec843a43f9b2
bd92ad836f447320148262a4492d7aa3f974d26b RVM-1116 / MRP-5 c56cd13fbe43b606106e7cd5e55bce26a244105d
887b09c7beccd11eba801993f3a67364654586eb use JECXZ to implement shorter instanceof and checkcast checks 17ad12cc0f95504d160b250af769a4590e3475cc
c4e305e7aa1255faa5318690106f7dc829075643 Reduce visibility of elements in baseline BasicBlock e57434bdeeedede3cd3732fc153c56f40de20c78
92409c3bd94d2ff6500a7aaec912464dbc7b8583 BytecodeConstants changes, removal of fullyBootedVM, changes to use shorter instruction sequences, bytecode fusion (MRP-6 / RVM-1117) 65bd754ba3473e8ddf91d41b45a0d12da088b92b (BytecodeConstants changes)
2880b01ba1e6a62c4f1172cef066f2a7372c6ba9 (removal of fullyBootedVM)
51c9defb82937fc12bb87728543f59850fd33d9a (use shorter instruction sequences)
0d5d972389c0ae02e1c00036898fee2c2e2cb981 (bytecode fusion)
4fb07ec09cb07b1979d13867975bc434ea8f31d9 changes to the IA32 baseline compiler for floating point comparisons and lcmp ff470e755f9156d126cdf825fe80c2932c46347b (floating point comparison changes)
b746c17c9217b321487e68f112108c3788675f2e (lcmp changes)
f685aa929e4fe4197907aca9972eef73f2b5640b merge changes won’t be merged; extra info for uninterruptible violations was merged 089b6b538de0739cc03b3de128fead533cb715fb
babc48ae94546e868dc5ca3910f563c2e61989f9 MRP-9 / RVM-829 7cca607624dd44af0385a5dbe3d291399a7b630f
e144150b8cb15182ed5439e8f196e32e623c15b4 IA32 lcmp bug fix b746c17c9217b321487e68f112108c3788675f2e
f04f14178f9a5114dd61f505af0d8addf8b2a7b4 lcmp tests. 018fa1e241338ef29b55ae4eac9ad1470d25d8e9
872cfb40439a21530cce460ef4c6de557d100e0f improvements to IA32 floating point moves bf23dfdaa98931cee9ae2b769fe4bf1f0e8227be
2fd1f13248c89c6b14513f1d365bb4b9265adcfb improvements to LightMonitor cfbb3291cd2c42cef911750dca57bab3d2201e51
6c8a8f532b7cdc95528e9b553182e87d5b8f0e1f x64 array access fixes for normal Java arrays e41eb8c941ab4149f7b0ea67dd5c4528a1d0b681
81a3ea8b7c8b0ac5b933450fe5ef73fb18ba4f08 Remove mach timebase info 993a906e8c1003c8ebc4b19b62d8d8ee003cbe16
704d9bd99a38a3c3652761ac0827b9bbe5491ec4
637b1c2657d10880498498469e71ff30e672e732
edge counter improvements (MRP-11 / RVM-1118) 67cfcc596b90fda2babae2817072cfd4889ff79f
7830bdfff42525de4c43ccb3b9d9a251cc57ea99 remove jumps from IA32 baseline compiler long shifts where possible 0732e80a948417fe070e9e5a8e4a8c28fc6443f2
7a4408b938a7f31bb89a9eb831bb1d2c7f0c8714 tweaks to IA32 floating point instructions, correct floating point remainder for IA32 baseline compiler (MRP-12 / RVM-1119) 5eb6044ed4b9d0b124464a07848bbef563a1f46a (floating point instruction tweaks)
d15fbc4bbf0fcec6be1c64a1ddbb1c35fecc2af6 (correct floating pointer remainder for baseline compiler)
7aca6597129f5faa782c3e636e6e83a44bc8edcf Optimizations for floating point operations with NaN 894adb4a1da613969963757d8bfeeff60d60b24c
4dfefdff62fac3ef783a37fcc31d93cdaac5c704 Use isValidAs8bitRegister() for more assertions in the IA32 assembler 5ea8db526457197e0bd1f4f69608cc6de3ebe627
fc1edfda5227ddbf3c8030c40df74454a4e2c805 Introduce helper method for accessing MemberReferences as MethodReferences or FieldReferences cf53c9958e9f2be492984f80bd8f12198b5e4c5a
e06fa2993725be95515596cfcb74c7b007b2561e x64 array access fixes for unboxed arrays e41eb8c941ab4149f7b0ea67dd5c4528a1d0b681
8ce02705d334b17db45040b65a53de1d800fc9b6 x64 fixes for MultianewArrayhelper 659c74ed89b3a513dfbd0b78b0794660c2fc449f
729878c014e3f40992c4276d852351ed27de3752 x64 support for getInstructionFollowing, var arg changes for JNI 7a540b94a989b9aa8b1bd30eee8f13f453cd529d (getInstructionFollowing changes)
6cbd7ef587f80aaec749325a1341fd69976866aa (JNI var arg changes)
b67bdb597057df6ed682bf2732cbf3fac2dd3251 Add support for MOVSXDQ 36fc720f2841ebecfe3ba106b876399603dc18cc
633ffa0d990f51bee29c4e7e5b8e4eb32047adaf various baseline compiler 64-bit fixes a64b192a540aa41cc9b41a8b5ee7369278830373
6ed6a338837974bcd460a5e8050a24583cc70aa6 add missing JNIEXPORT macros to JNI tests efe366d666517ab85abc354189c4f427001ed009
c9019db32827e7fd3dfcb9a465a0ca18ff5685e9 JNI stack alignment for x64 866c22673c5e7898b7f355210f20390bd8e1f27d
e923bf0fabae5a54f1863bb1c822c689162736f4 changes for pushing and getting JNI refs, JNIFunctions changes not yet merged 9d29e8cdab7f3a719f0571104d02a2c5d7dbe335 (clean ups for pushing and getting refs)
760de64d38b97b317bb9fbfbe672baba6e068f4b (Make JNIFunctions in JNIEnvironment untraced)
7ef46b57912510f792949a752ba74a1202047b04 remove use of JavaObject type (a non-C type) from bootloader 597db5166df1923fb6418fff693799f00f9a1cb3 (migration of bootloader to C)
e810e66b431efc8a8eec4779e2f694519ea6e709 print stack trace when flushing of standard streams fails 17da4571e7fc3162110a053d6edf73926795c08a
fa8510e76da850aba2260b79005d276eb69fa3a7 var arg Java accessors 6cbd7ef587f80aaec749325a1341fd69976866aa (Java accessors)
760de64d38b97b317bb9fbfbe672baba6e068f4b (mark JNIFunctions in BootRecord @Untraced)
bd583bc84fcac23d24545767291bd3c00dba2447 Add an assertion for stack heights in the IA32 baseline compiler 642cd5562ccbf295c7f8b569d57f43d081ccbc71
725de2c8f18862beb6d302a229b39a636f13c22d RVM-1120 / MRP-15 b04f865592aeb76aa4a36cd7a1025ad2b850eb0d
76235d5115de39c7bac57368e98acc289062e7f0 Make field final ce65c44cdfa7c0ae2992bb19530b41b5beb6eb48
fb34fc508d5572b1cc2940e2231c0dd98f55a902 Missing GNU Classpath primordials 00d84c7b2a4c13c31bf1319ca9ac7aab3d9d966a
94c7f2a2e23f2ad46154b9e59f2c49d003c68c20 66a49cd15abaec776c56855262acf3bed845e652 RVM-584 (Automation for gathering compiler DNA). The changes to CompilerDNA.java were not merged because they do not apply to the Jikes RVM. a987aeb1642fdd74316ad41043b15c8be2f305ec/
03021cb9702c1b3c79b3eac3bb215b0383d39753 Bug fixes for ComplexLIR2MIRExpansion merged, rest not yet merged 684fac08833da73e27f7dccf5945e375686fa8ad (ComplexLIR2MIRExpansion)
3749592d31493e5f98f243fa7f9336b445bfd512 (EMT64 removal)
7a389488174d97bb97d2fdc67d3649fc6a6ba717 lcmp without branches for IA32 b746c17c9217b321487e68f112108c3788675f2e
a8ab0ed115cbb26a549a10eb7c85b0ad9f4be2c3 Reduce number of branches for d2i, d2l, f2i and f2l in the IA32 baseline compiler 7d2ac70eeee41f8d2988765eaf2a3ff9a475e1ad
088300e8c841869de705a9788a23ed21310b010d Allow inlining into massive methods (RVM-1042) f7e1a8119f222f53cc733211f789c757575c0ec1
443c83b3ab502c748c2f59ee4bff61163f05e7f0 switch to opt_assert, BURS bug fixes 0585d8ff4a6142a903172aabdd5ac4cbfa056964 (switch to opt_assert)
c901ed42371be57c37aa33d92d9ca239423c0852 (BURS bug fixes)
33f0837b0caa4dc280d956d0721e1bf19e108745 MRP-23 / RVM-1124 (make IR construction for Magic canonical) 6ea4feda95a52059d46a12be721047bf6a95be09 (replacement of “new AddressConstant(..)” with “IRTools.AC(..)”)
50a515ed09d2f693775c8eba37e622e48f6db1f7 (Make IR for Magic canonical)
6c45bfaef5bb1884898e8bf67d009514b1657a66 (opt_assert for BC2IR)
3a30a2f1bdca639106746ff4058b7f7ae9bb4d7e verifiy that IR is canonical 50a515ed09d2f693775c8eba37e622e48f6db1f7
e7b9fb45d5550493972d74fbdd512f9712e5521c avoid problems with movable object constants 50a515ed09d2f693775c8eba37e622e48f6db1f7
a849c07a31664be17180e22fb39ef501e783e4dd Make lneg implementation consistent with opt compiler 113ecfc23c18eb52bfaf1abf8821a89e340dfb9b
bb4b16ccb0ce836562572e250e6748e329d6c722
d9d751f002bccee4c8cf2f93ed8e5d69e966e4d3
9228ca459c3c08e2cc86dab87bdcb38f7fdc43e5
90e921a4f7f8b5ad2c0ad5926fb998a061c2a850
opt_assert changes 0585d8ff4a6142a903172aabdd5ac4cbfa056964
dce47314b403ce7c095ec1625b8a5b2492c207b4 x64 opt compiler fixes. Used Da Feng’s fix for the IR changes. a258116d3e587153bf97cd0fcdd0858dedb32ced (Introduce Offset.fromLong)
ecc7562406fd38bce74c5874999a24a861b163b0 (Da Feng’s fix)
50a515ed09d2f693775c8eba37e622e48f6db1f7 (bug fix for GenerateMagic)
c901ed42371be57c37aa33d92d9ca239423c0852 (BURS bug fixes)
464fed3d6a7f90476aeb80060ab21c0a08c7cbec 64 bit fixes. Rule and BURS changes are not yet merged. eb2630ce40882676dd575cc5385d4fddfc7de23d (GenerateMachineSpecificMagic, NormalizeConstants, AssemblerBase, StackManager)
c901ed42371be57c37aa33d92d9ca239423c0852 (BURS bug fixes)
be94f3408ac0f07b396f9f040f51f4576085ccd2 x64 opt compiler fixes 44411cd32a01fd0f8caa911ebcb5fd3cc28b9887 (StackManager)
eb2630ce40882676dd575cc5385d4fddfc7de23d (PhysicalRegisterSet)
c901ed42371be57c37aa33d92d9ca239423c0852 (BURS bug fixes)
2fe3f41efcd8787f2e340d4b0cc19f9d739bfdac Correct type for temporary register in CallingConvention 93aa0cdd3dba18e49244de7fe5a18fd8bf5283c8
915d388ccbfe936e31be7b1e9e8577a5a1a7da1a bug fixes for bytecode fusing 0c920e55e086164aa6f3f185c2b212c4529b3888 (bytecode fusing)
08bca9db0ec0c799bff0a4d66b51ef5645076c13 769ae73848fa2186266e0b6e99fb3c0f82cc86eb RVM-95 / ECJ removal 25912bfb880e8f8c704677600b15641a78936af0
2a19e545c4c1d4ec53bbdb6ac649df6da78f7466 Refine assertion in BuildBB c28a46defa821436c4df7aaec893e17769962c77
4f3d3ac385928bfb88a8ad9b9bc77476e54badd9 Increase available space for x86_64_m64-linux 4e63ca9bb61e13ce6e793e228b5d982bc36342b4
eff1aa489facbf3756bad431c4af4f71497e9c92 Removal of ArchitectureSpecific, introduction of optimized JBurg, PowerPC fixes 589f47831908242b13a38deed9fa03c0a95ca7ab (PowerPC fixes related to template redundancy removal) 81b2b75fdeb5f2879607680b3fe7d8356353c368 (Removal of ArchitectureSpecific)
4846ffb0fca7c2647586ceb5c8bff374909aa303
ad42eb0bfd76bb0b276e294e1bc8d922344e4760
d0561a9726ed285097b77226809254578592676
Removal of ArchitectureSpecific c901ed42371be57c37aa33d92d9ca239423c0852 (BURS rule changes)
81b2b75fdeb5f2879607680b3fe7d8356353c368 (BURS fixes during removal of ArchitectureSpecific)
31d11685042d1bb38ed52623f2155f7819ad9484 changes for isTwoWayBranch() 81b2b75fdeb5f2879607680b3fe7d8356353c368 (Removal of ArchitectureSpecific)
3d257cd17d156d58273b7b2f5595ad540317c8ec primitive array store helper changes, baseline magic fixes, array access fixes b7eaa05705dccf494e098bf6d61b092b26adbbda
54bb80d68c53b4d4e52f25a12fb0cf1b4c5adecb (64-bit fix for array indexes in bound checks)
eeb1a381874d00bacd8ab6bb21e986448d8db1c6 Initial host and target files for OS X 64-bit 0ae42531dd3a1bfbb054f81c77970b21abc3f8e5
155f1c20571b56e8598ba82d4fdb9ee4cc83867c update of PowerPC host property files for migration to C merged, PPC bootThread changes merged, PPC Registers changes merged, PPC signal macro changes merged 597db5166df1923fb6418fff693799f00f9a1cb3 (migration of bootloader to C)
64a5ae72120273d8ab638ccbea10524b52876c46 (Annotate PPC Registers with @NonMoving)
4788d9c0cb3bf80267aa9878ed5ab0286430c0e2 (PPC signal changes)
81b2b75fdeb5f2879607680b3fe7d8356353c368 (Removal of ArchitectureSpecific)
a7e20cbf030517a72079ce7c6c8d7461f89b0240 bugfixes for IA32 getInstructionFollowing 7a540b94a989b9aa8b1bd30eee8f13f453cd529d (implement getInstructionFollowing based on MRP code
ba3c07869445954b5960f7001e9bb1042ac1d7ee Da Feng’s bugfix for register encoding in IA32 signal handler in the MRP version 4788d9c0cb3bf80267aa9878ed5ab0286430c0e2 (removal of libvm)
0821fbd9b7b93942f5b7e64cf7e898100a745de3
3cf635b565e5c8b7244ae2fcceecfa3bae7051dd
05544d87afccac3305421532f95b3b427e03c99c
35c5b0bae6282c4da6d383d55cc5341905b3bf1f
4015a0aa5cc0c0120bfa2dd388bdd641a18eac74
73bc5173d3a5f4b654c1b95c3a1099f3322b47e0
7bf07a35301db028f039aea3d51219f3419c349b
302d6f3190368645bc14a90856f36d07b07bd602
7664ca4e66bbe62767484f54f0643b6ec58cc1be
b5043d8e50b4fa66c4994668c8f1be5adfe6f531
BURS rule splitup c901ed42371be57c37aa33d92d9ca239423c0852

Changesets that are only partially merged and still in progress (unordered)

MRP Commit Notes Jikes RVM commits
f9d3e0f2cdb88807420bdd87115a64592a253e41 Bytecode fusing and removal of redundancy from baseline compiler templates merged. Use of VM.Production not merged. 589f47831908242b13a38deed9fa03c0a95ca7ab (remove redundancy from baseline compiler templates)
0c920e55e086164aa6f3f185c2b212c4529b3888 (bytecode fusing)
f0b32ca22c3462481a81f14f80e1173d1e9a692a OS X 64-bit support 0ae42531dd3a1bfbb054f81c77970b21abc3f8e5 (some changes for OS X 64-bit support)
007fa19fddd2eaeb31f02a87d512e903a4778c92 JNI var arg changes. callMethod merged, packageParametersFromJValuePtr merged, var args for IA32 merged. Still needs implementation on PPC64 (and possibly PPC32): PPC currently uses the old Java definitions. 4926f5569a22a937aa3dfc42cc3e8e113f2d140a (library files for JNI tests)
d4536ffe0116206e868c8afd0f2e25947f6794b7 (introduce callMethod(..))
f591d18550c714b2b3e0d9fd028b154d834bbb8b (fix for compile error)
eb52f590be90da67bcaf68a5638c9fc9897c075b (use the same method for packaging jvalue parameters on all architectures)
20085336d51618cd68dc3341274903995d3675f1 (Use a single method to invoke methods whose parameters are passed as jvalue array)
2b0861dcd6609aad4c9b75da9654d18dfb73ffff (JavaDoc fixes)
6cbd7ef587f80aaec749325a1341fd69976866aa (var arg changes for IA32)
4ea7527ca54d7c96839bfdf568b722e64f7f8599 Removal of JDK1_1 args not merged yet (need to decide what to do about AttachVM.c from the JNI test directory; possibly need to write more tests), Windows fixes won’t be merged 0d95b72a6ddbbf1aa5d36dc4f2843050ac6d4c8c
339695041ec9f88b4552ddb071d9869e72c05d2e VM.Production changes haven’t been merged, rest has been merged c33c2428fd9d9540c386f9d8a36895ab5ff9e919 (shorter encoding of 64-bit move immediates)
41db47bfe830dd778f30fee633d961bfd290d636 update of ia32-linux.properties for migration to C merged, rest not yet merged 597db5166df1923fb6418fff693799f00f9a1cb3 (migration of bootloader to C)
d38420e7fea6aac84f7300d6f089f3292be3adf1 All x64 changes were merged. Additional fixes by Da Feng are also contained in the commit. The OProfile changes have not been merged. a4764e3f72b11246980bdf74045d8d8aec6156fe (OutOfLineMachineCode, ThreadLocalState)
8c6e2ddab6a046791372bf65a1a9d4def4fe765c (Remove IA32-specific methods from ThreadLocalState)
08b031163d63875a14ca8e7f29883284451d0cb8 x64 opt compiler fixes a7626555f445453afef1e6287ea155f5b7ecc6f3
d5546992fb33412aa55116549daf42a2ccfc299d
44411cd32a01fd0f8caa911ebcb5fd3cc28b9887 (StackManager)
684fac08833da73e27f7dccf5945e375686fa8ad (bug fixes for ComplexLIR2MIRExpansion)
787c4be99c085ce1fd708dd54bf5da3126edf81e (correct treatmeant of stack slots for CallingConvention in 64-bit case)
eb2630ce40882676dd575cc5385d4fddfc7de23d (RegisterPool, GenerateMachineSpecificMagic, ConvertALUOperators, NormalizeConstants, StackManager)
3749592d31493e5f98f243fa7f9336b445bfd512 (EMT64 removal)
071eb5df19f0d33ce99a7cf9266ddf7a27af8bcf printf fixes have been merged, IA32 OSX dump context fix, build system changes have been merged a61c4c64147994789c25fba900c5e2c41029df4c (parts of the printf changes)
be8e2da46d8bcc216fdc6cf6fc75332761b0ed31 (more printf changes, fix for undefined behaviour on (sysDoubleRemainder))
4788d9c0cb3bf80267aa9878ed5ab0286430c0e2 (IA32 OSX dump context fix)
4926f5569a22a937aa3dfc42cc3e8e113f2d140a (build sytem changes)
8780f9f0896aef463c179181587e0a9ef95943f9 Only the GDB debug helper fix is still oustanding. 109610b5123fcc20e96c7b6b3b2cea24f7e901f6 (generator name changes)
82531721bff3b0cde4e6a74ab2d9e4a763a5df8 (magic bug fixes)
1b6ed7221b7a8970ee968be36d5dba08c0d047a8 (fix for emit_unresolved_getstatic)
2657e30c83862dddc7229b502f06e730b7177da3 (fix for emit_unresolved_invokevirtual)
866c22673c5e7898b7f355210f20390bd8e1f27d (JNI compiler changes that aren’t related to JTOC changes)
888f9b96481a04f42a8a6013f730e2c45698e004 (Refactor Bits into a utility class)
122f20aeec5cde0862a666f1efd0a52281afccb7 (Increase MMapper size)
c9ae189e7a2566fb65a1d7777af18c9f49360d20 (Support for quad word bit tests in the IA32 assembler)
1480b0106dcda6698b4b5d1d3959fd3c05acc4f4 (Support JTOC in a register on x64)

Changesets that need reviewing, more implementation or more thorough testing

MRP Commit Reason for review
0486d1bc63283d31672de8a63d4b67c6f23d7f98 Cheap null checks were broken in the Jikes RVM. They caused an intermittent pmd crash and were therefore removed by Daniel Frampton in commit 235ebbc823625da920485c8ed0cc47d52ba7cd4a. A thorough review of the MRP commit and a reliable test case would be beneficial.
d69b02b2c40b0f7a1178fc037e72467724a64d62
54af840c34da5830f6c5a31d81fc424d8e8b4abe
9648c4835ffc15f61939657e8f384ce512517474
99ca0bf61b2a7fe0268d0f1c27b81bba6c8a635a
4dc4346702597beff99b9ea781e507f2f6a67318
391cf5a34321db4e9c5a0b8ef682d5d2d9efabd5
See RVM-1114 (Java implementations for lrem and ldiv bytecodes for 32-bit targets). I’ve added some rudimentary tests but the implementation for PPC still needs to be finished (at least PPC BURS rules for the new operators are missing)
0d2057a0d51c29a429fcee72040ebd2ff96bd684 need to determine what the correct / expected behaviour for the option -X:sysLogFile is with the changes
68fdd785fa8665d20faf2a1b99b032d7a1bc9409 code seems to be unused
6226532b7fb9a4b6ebf27f98e1d7d4725b6a2a49 Need to evaluate whether that’s really needed
2707d84c03f3c569c71018d20af4de9d3348066c Need to check if GMP math is still problematic
80f910701d9597f710a81f1316337363f8948868 IIRC there were several changes related to JNI in Da Feng’s patch in the Scanning class. Need to check if there’s a conflict and/or if the changes are related to this commit.
007fa19fddd2eaeb31f02a87d512e903a4778c92 already partially merged (see above). However, PPC64 currently doesn’t use the new var args code. This needs to be investigated and possibly fixed.

Changesets that will not (or need not) be merged (ordered from earliest to latest MRP commit)

MRP Commit Reasoning
870e57d18ce7c99e8d8c00b5e0adfe7b2f953280 not useful: was reverted in 61c36f01e1009f7d2a5e8b0f5e41a68fcb6abea0
61c36f01e1009f7d2a5e8b0f5e41a68fcb6abea0 not useful: reverts 870e57d18ce7c99e8d8c00b5e0adfe7b2f953280
ca2a03dd41b9b662ab4feed0c4952552265aab79
ae351813a10fdc8723a3866b3ea74558646ad95b
3cf67066310e66f75d371de1942563332592415e
Classpath 0.98 merge; done independently in the Jikes RVM
6801f6047342f494bc0685b605ac9289a60d62c0
94a8f7b6544222f5db8decc752c53d8cc4ef4d5c
492547e056df1a0cb255eec5b069f2a5d553f9bc
3001384d9b46932148239cf35232a1f72ce5be84
2a5174b09393ea2334376a3b68300ca88105fd21
4f46e92cc2c79c1ef6af3420b82c0c80798b15c2
bd0a42691d57ca29515e306f4a0873926c168b59
257995084602f453cbc2a785caf6ffbce25fbfad
2443594ffb5048a2914cad4548c9726cc1dff99e
d0dc150bab46ef092b07322e30d048c69e7de785
d0eca55f107ec108693e7c118f748a15c6ef5244
e8872df3abbbadd6be93c2312adbd4d3c67212b4
7cf0f754c722976f81a50e1896245e5daec53ee1
bc67cbf404c94ae6a292a46ab1290b60eeb43f12
11e9a21dabd7e2963269c95edd5e0a592718f0c4
cda33b4c8ad40c2e20f4edfeb1b7ae119db85fef
1323b4b3e3b2e912112106e1d83704ade5e07552
ad0b655c1bbcca036f72e91abe427a328ca6cc36
adafe09d0ff2b82f8967bc85179bc72e758aef42
d2911f2bb211ecb41c82818c0dd8ab716e7a3ef1
Apache Harmony fixes
ec9018cbda6fee0d6d22ecda95b4ce049dc776e6 IIRC fixed independently in the Jikes RVM
87eba37d88cb43637c52bc57f1104a0290d17314 Merge cleanup
4ec46a091c2773e1821c8525d3d0555154438064
0fe989066fde2fe3d13a55c6788e7786a1504d5e
Needs independent fix in the Jikes RVM because we do not use Harmony, see RVM-799. The changes to the Classpath patches are only merge cleanups and thus not relevant.
ffdb2c988520d754ce9910689f2a4af337fd8e3e changes don’t apply to the Jikes RVM or were already fixed
e0a140e49a5e8b1a7ba1fa6e93dd9c1d6f8d3fdd changes not necessary for Jikes RVM implementation of getFollowing
db3c06d8db40cd2ae1c1eb6f91f0758eed531404 Merge with Jikes RVM
a85d04b706aad3628140954ab96a0eb858ad0416 Merge cleanup
29f6a7d67ce38d073a666a34ddeec581433c4b27 Already fixed in Jikes RVM
771ce29be75008b102fe907049cd699cde424c89
a178587d995b91854b85b981092b6dda5128718e
8d83d3fef69b22ebb05657cc6435c3465a643697
926df782199b3e87be9adadc44c8c20eae6d9810
178f69481f4b59584a3d589ae13bf6267eb0640e
9d29b83cb0d632883991d08478f3b95ceb5a24ed
e982535323f378d42b051e62c4bf85e28edeca2a
bcf8ad1e63938d7c00e77c6068085e968b8ed57c
a7f92421e45307249ee4f86a5410625461bde428
16624512e4e52162a17ee7ef891da92143109ecd
bab123a0cf5f36d1ad1337c26b0a100e8096aebe
60f79dd93f4d5575e7fef497ee5b31a4731ed7e1
b9ad7a411fd02f5558e25485d61e4fe7f6c8d6e3
bab123a0cf5f36d1ad1337c26b0a100e8096aebe
9fc2b7593dd52f5bcd0522af009d0d8be30d790e
Windows changes that are not useful for other platforms
d68755e957dc406915c6849aa135679953d0a7c3 superseded by later JNI changes
f90ba62205167ccd65428aa9cda6253f8d9e90f9
22e4f04a5e07d773696370ecb696b14bbcced060
Merge with Jikes RVM
c71eae15e41376a539f88a4d17e02c28fd16c7e1
618305b7ff738a2a89968545b7b14d1988bffc8b
105fa582dd8a1355ee42bf38ed9575978dcd0087
Checkstyle fixes that are already applied
8d7205765382ba1dc1639dbc1b6a87a53c2e41c5
a5fef4aa44b47f1334205ed72999740e388f9cca
already fixed in Jikes RVM
cdfec810d276944803c7a8cd887335cef97c226a
15e906e7b52a839dc8ef60ad86c7fba7abcfd76e
c7ababac97ca7b6e59ee356eba20d342a95e0f03
1f0f6e7033e774994deb9d751b8bf854d52a31c8
c3e58fcdb790349f554ae82babc3263098f2fb5b
d1c19da1284986f233612223de1a07d6dc13e029
a51b7a088f57f6c199c2bb18121f158014ddcb6f
63c9c1bb0c29c43cab7231002d0de52d02f7d132
cc35b764955254b12567fc951e0424d7a679ce14
f82ebd2fde7731ac28622d13cb5007ed6cd13d4b
53d3bae4037fc985b3f314e97fc098ae71180a5e
505e123309945b16a76044eafadb7b4062d56089
9492addd172ca73ddc8241e95f8053dcb7e44171
039b9e29346cee71131552086f807fbf7fecb4c8
8066d60c71c43ed96e2fef28f6ebe41474229862
dbt (which we won’t merge)
b678878932c3391575fa9cc8a25b37c910721912
1ad4e572bb98c416badc0c7f40668b7aa167d895
2997587d8c72cc55b5232dc1799bfa51b2b21aa8
8449f9790134bac0df553f0b7c2660a6287f5f50
3db3489e7eb6a4bb5045310992081727eddd7084
dc3215264ffd5dc9e78d7fdfe03fc0a2ded7238e
f825483576855275d7ace1a164cbfd6edd87af46
Merge with Jikes RVM
[ b9a2daf0e29f54f1592baa688e626143d0a75f63
5ea86f87f6d670b8b93a6223ab59cc247e914454
Remove constant interface antipattern for BytecodeConstants. This was fixed independently in the Jikes RVM.
f35958abe37b284e9aaa5831d54666d8bf7044fc Switch to Immix, already done in the Jikes RVM before MRP switched to it
ea8b0be486e766afcd3ab5327a630f844c680c49 Already fixed in Jikes RVM
39c748d57340ed66c59d698d64cc71a4bb8356e5 Removal of unused files
bee01390c061dfbe746f79bd45affdae94529b33 Support for thread priorities, fixed independently in the Jikes RVM with another approach
5f385e87013675eb7b95e614bbe22c4fce0aa1c8 Problem wasn’t present in the Jikes RVM
e46f05dc39c1aca05d696e9f3156a87afad46487 already fixed in Jikes RVM
c6ef5c9fb2376180b65cea84c3533310196661fc IIRC fixed indepedently in Jikes RVM
93f27f232297c7ba99cc713cc1a0e64abb5f9557 already fixed in Jikes RVM
2d99fc8cc09c9168878ad9cd6c5c69eef17efe96 not needed because the original implementation and the bug fixes were merged in one go

Unprocessed Changesets

Everything else has either not been merged yet or nobody has filled out the tables above.