Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update SystemZ [part 2] #1305

Closed
wants to merge 4 commits into from
Closed

Update SystemZ [part 2] #1305

wants to merge 4 commits into from

Conversation

mephi42
Copy link
Contributor

@mephi42 mephi42 commented Dec 12, 2018

Continuation of #1230

I've found and fixed a bug that caused mnemonic field to be empty.
Here is the simplified diff since the last time:

diff --git a/arch/SystemZ/SystemZGenAsmWriter.inc b/arch/SystemZ/SystemZGenAsmWriter.inc
index b4f5dc2e..bdc3a5aa 100644
--- a/arch/SystemZ/SystemZGenAsmWriter.inc
+++ b/arch/SystemZ/SystemZGenAsmWriter.inc
@@ -10633,8 +10633,6 @@ static void printInstruction(MCInst *MI, SStream *O, MCRegisterInfo *MRI)
     0U,	// ZAP
   };

-  SStream_concat0(O, "\t");
-
   // Emit the opcode for the instruction.
   uint64_t Bits = 0;
   Bits |= (uint64_t)OpInfo0[MCInst_getOpcode(MI)] << 0;
diff --git a/contrib/sysz_update/0005-capstone-generate-GenAsmWriter.inc.patch b/contrib/sysz_update/0005-capstone-generate-GenAsmWriter.inc.patch
index a4b23347..cd1353eb 100644
--- a/contrib/sysz_update/0005-capstone-generate-GenAsmWriter.inc.patch
+++ b/contrib/sysz_update/0005-capstone-generate-GenAsmWriter.inc.patch
@@ -71,9 +71,7 @@ index 3c4c9c8e5c6..15c030d662e 100644
    }

    // Emit the initial tab character.
-+#ifdef CAPSTONE
-+  O << "  SStream_concat0(O, \"\\t\");\n\n";
-+#else
++#ifndef CAPSTONE
    O << "  O << \"\\t\";\n\n";
 +#endif

* Tablegen patches. Right now they are SystemZ-specific, but
  dependencies are fairly weak, and it's possible to easily
  generalize them to other architectures.
* README.md file with instructions.
@XVilka
Copy link
Contributor

XVilka commented Dec 12, 2018

@aquynh hopefully this one and its parent will make it into version 4.0...

@radare
Copy link
Contributor

radare commented Dec 13, 2018

ping @aquynh this should be in the v4 release

@aquynh
Copy link
Collaborator

aquynh commented Dec 14, 2018

@mephi42, thanks so much for your amazing work!

i am still reviewing this pull req. done soon.

@radare definitely, but since now is close to 4.0 release, i think it is better to push this to v4.1.

@aquynh
Copy link
Collaborator

aquynh commented Dec 16, 2018

i want to squash this pull req into one commit. @mephi42, could you please make pull req to the "next" branch?

thanks

@mephi42 mephi42 mentioned this pull request Dec 16, 2018
@aquynh
Copy link
Collaborator

aquynh commented Dec 16, 2018

merged into the "next" branch, which targets v4.1.

thanks!

@aquynh aquynh closed this Dec 16, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants