search

SDL-Hercules-390 / hyperion

The SDL Hercules 4.x Hyperion version of the System/370, ESA/390, and z/Architecture Emulator
Other
237 stars 89 forks source link

Zvector E6 instruction updates #667

Closed JamesWekel closed 2 months ago

JamesWekel commented 2 months ago

Fish,

Here is a new branch with the my updates and is current with sharedvfp branch.

The fun of multiple concurrent and independent developers. Github indicates that branches can be automatically merged. :-)

Jim

JamesWekel commented 2 months ago

Fish,

Thank you. At times Git & Github confuse the H... out of me. I very cautious which is why I closed the old pull request, resynced the sharedvfp branch with my fork, created a new branch (zvector-E6-6), merged (Github pull) the old branch (zvector-E6-5) and then this pull request. Could it be part of this process that is causing 4 files to show changes when I only change two files: opcode.c and zvector2.c?

The next pull request will be 16 tests and all their files.

Thanks again. Jim

Fish-Git commented 2 months ago

Could it be part of this process that is causing 4 files to show changes when I only change two files: opcode.c and zvector2.c?

I don't know. All I do know is that they're different (or WERE different).

I use a visual file comparison tool(*) that allows me to compare the files in one directory with those in another (or an individual file with another), and it reported that those 4 files were different. Comparing the files directly with one another showed that they were indeed quite different from one another. How that happened I don't know, but those 4 files WERE different. Which is why I was wondering why GitHub was reporting that only 2 files were changed.

Maybe GitHub is only reporting which files were changed in the most recent commit? Maybe those other two files were modified in an earlier commit? I'm beginning to think that is the case. Which, for a Pull Request, is stupid. A Pull Request is a collection of modified files, so in my opinion, GitHub should be reporting how many files IN TOTAL are being changed by the Pull Request.

Regardless, I reviewed all 4 files (I reviewed EVERYTHING that would be modified by the Pull Request) and everything looked okay to me, so I approved your PR and did the merge to pull your changes into the sharedvfp branch, so the issue is moot at this point.

(*) ExamDiff Pro. Been using it for years now, and could not imagine doing any type of serious software development without it. I consider it an absolutely critical tool to have in my toolbox. A true "Must have!".

JamesWekel commented 2 months ago

Fish,

I think the 4 files difference is a commit timing issue. mcisho's commit 08f4ea1 updated ieee.c, and zvector.c. BUT my pull request was based on the sharedvfr branch before that commit and only updated opcode.c and zvector2.c.

Could that be the issue?

On Windows, I periodically use SourceGear DiffMerge for directory / file differences. As I'm doing most of my development using VS Code to a remote Linux system, for file differences, I use VS Code's build-in file compare. Still, need to look for a directory compare tool.

Jim

wrljet commented 2 months ago

For Windows, WinMerge is good.

Fish-Git commented 1 month ago

I personally recommend ExamDiff Pro. I've been using if for years and love it! It's not free though. Costs money. But it's well worth it IMHO!