Code review request

[GoogleCodeExporter]

Purpose of code changes on this branch:

Implement several ALU and PFLOW instructins. Make tests.

When reviewing my code changes, please focus on:

New binary test. Instruction execution at all.

After the review, I'll merge this branch into:
/trunk

Original issue reported on code.google.com by Mikhail....@gmail.com on 20 Apr 2011 at 11:10

[GoogleCodeExporter]

Set review issue status to: Started

Original comment by grigory....@gmail.com on 20 Apr 2011 at 11:46

• Changed state: Started

[GoogleCodeExporter]

Original comment by grigory....@gmail.com on 20 Apr 2011 at 11:48

[GoogleCodeExporter]

Set review issue status to: Fixed

Original comment by grigory....@gmail.com on 22 Apr 2011 at 8:52

• Changed state: Fixed

[GoogleCodeExporter]

Please commit.

Original comment by grigory....@gmail.com on 22 Apr 2011 at 10:02

[GoogleCodeExporter]

OK. How can I merge merged branch with HEAD? May be like this:
svn checkout ...svn/trunk mdsp
svn merge -r N:HEAD .../branches/mchurikov-issue29
But what should revision N be?

PS. merging with N=457(branch_made) asks lots of conflicts about the same code, 
and merging with N=590 deletes my changes. Try to simple svn merge trunk with 
branch

Original comment by Mikhail....@gmail.com on 22 Apr 2011 at 10:19

[GoogleCodeExporter]

I would do as follows:
1. Made sure that all my changes are in the branch (i.e. they are at the
server side)
2. svn   checkout https://...svn/trunk mdsp-trunk   # checkout main trunk
3. cd mdsp-mt
4. svn merge https://.../branches/mchurikov-issue29  # That will fetch stuff
from server and attempt to apply it to main trunk WC. This should also work
for local WC version of branch as a source of merge but I never tried that.

If there are any conflicts reported by SVN client, first see the difference
with "df" (diff-full) and if they are not serious, answer "tf"
(theirs-full). I suspect you can have newlines different for different URLs
and that can confuse SVN client (and you). You can always postpone conflict
resolving.

5. If any conflicts are still unresolved, do
svn resolve -R --accept . # Check with 'svn help resolve'

6. Run 'svn diff'  to see if everything is OK

7. Now  you have working copy based on main trunk with changes from your
branch ported to it.
svn commit # and pray...

Good luck!

Original comment by grigory....@gmail.com on 22 Apr 2011 at 10:33

[GoogleCodeExporter]

Original comment by Mikhail....@gmail.com on 22 Apr 2011 at 12:08

• Changed state: Verified