Skip to end of metadata
Go to start of metadata

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 Mon, 1 Jun 2009 16:00:10 +0200.

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

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

MRP CommitNotesJikes RVM commits
90be4471c1650641b02b3a350063778484d27a3cOnly moving of contents of cmdLine.h was mergeda780429ac46044124ca404482c4c192ee269a3d2

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)
08b031163d63875a14ca8e7f29883284451d0cb8x64a7626555f445453afef1e6287ea155f5b7ecc6f3, d5546992fb33412aa55116549daf42a2ccfc299d
be94f3408ac0f07b396f9f040f51f4576085ccd2x6444411cd32a01fd0f8caa911ebcb5fd3cc28b9887 (StackManager)

44411cd32a01fd0f8caa911ebcb5fd3cc28b9887 (StackManager)

5ff473b86fd7f4144cabd757d3c046ce3f45e42ex64, bootimageRunner printout cleanup, remove APR0cf9dbf84e254b2f01f013b233008caea392f507 (libvm.c SIZE_OF_POINTER changes)
dce47314b403ce7c095ec1625b8a5b2492c207b4x64. Used Da Feng's fix for the IR changes; rest still unprocessed.ecc7562406fd38bce74c5874999a24a861b163b0 (Da Feng's fix)
33f0837b0caa4dc280d956d0721e1bf19e108745MRP-236ea4feda95a52059d46a12be721047bf6a95be09 (replacement of "new AddressConstant(..)" with "IRTools.AC(..)")

BytecodeConstants changes are merged; removal of

fullyBootedVM is merged; all other changes are not yet merged

65bd754ba3473e8ddf91d41b45a0d12da088b92b (BytecodeConstants changes)

2880b01ba1e6a62c4f1172cef066f2a7372c6ba9 (removal of fullyBootedVM)

071eb5df19f0d33ce99a7cf9266ddf7a27af8bcfSome parts of the printf fixes have been mergeda61c4c64147994789c25fba900c5e2c41029df4c (parts of the printf changes)
792bfdcfa96368780e982119081950c00b97fb58Only changes to use arg path instead of arg value have been merged8aea28a807abdda44c4a3c12258431a612406874 (use <arg path> instead of <arg value>)

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

MRP CommitReasoning
870e57d18ce7c99e8d8c00b5e0adfe7b2f953280not useful: was reverted in 61c36f01e1009f7d2a5e8b0f5e41a68fcb6abea0

not useful: reverts 870e57d18ce7c99e8d8c00b5e0adfe7b2f953280

Unprocessed Changesets

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

  • No labels