Mirrors/asmjit
1
0
Fork 0
mirror of https://github.com/asmjit/asmjit.git synced 2025-12-17 12:34:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Emit/Log instruction with immediate properly if memory operand has been used with Label.

Browse Source
This commit is contained in:
kobalicek
2014-09-29 20:29:30 +02:00
parent 80687fc47a
commit fd0972d9c6
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/asmjit/x86/x86assembler.cpp
View File

@@ -869,22 +869,22 @@ static bool X86Assembler_dumpInstruction(StringBuilder& sb,
return true; return true;
} }
static bool X86Assembler_dumpComment(StringBuilder& sb, size_t len, const uint8_t* binData, size_t binLength, size_t dispSize, const char* comment) { static bool X86Assembler_dumpComment(StringBuilder& sb, size_t len, const uint8_t* binData, size_t binLen, size_t dispLen, size_t imLen, const char* comment) {
size_t currentLength = len; size_t currentLen = len;
size_t commentLength = comment ? StringUtil::nlen(comment, kMaxCommentLength) : 0; size_t commentLen = comment ? StringUtil::nlen(comment, kMaxCommentLength) : 0;
ASMJIT_ASSERT(binLength >= dispSize); ASMJIT_ASSERT(binLen >= dispLen);
if (binLength || commentLength) { if (binLen || commentLen) {
size_t align = 36; size_t align = 36;
char sep = ';'; char sep = ';';
for (size_t i = (binLength == 0); i < 2; i++) { for (size_t i = (binLen == 0); i < 2; i++) {
size_t begin = sb.getLength(); size_t begin = sb.getLength();
// Append align. // Append align.
if (currentLength < align) { if (currentLen < align) {
if (!sb.appendChars(' ', align - currentLength)) if (!sb.appendChars(' ', align - currentLen))
return false; return false;
} }
@@ -896,19 +896,21 @@ static bool X86Assembler_dumpComment(StringBuilder& sb, size_t len, const uint8_
// Append binary data or comment. // Append binary data or comment.
if (i == 0) { if (i == 0) {
if (!sb.appendHex(binData, binLength - dispSize)) if (!sb.appendHex(binData, binLen - dispLen - imLen))
return false; return false;
if (!sb.appendChars('.', dispSize * 2)) if (!sb.appendChars('.', dispLen * 2))
return false; return false;
if (commentLength == 0) if (!sb.appendHex(binData + binLen - imLen, imLen))
return false;
if (commentLen == 0)
break; break;
} }
else { else {
if (!sb.appendString(comment, commentLength)) if (!sb.appendString(comment, commentLen))
return false; return false;
} }
currentLength += sb.getLength() - begin; currentLen += sb.getLength() - begin;
align += 22; align += 22;
sep = '|'; sep = '|';
} }
@@ -4114,6 +4116,9 @@ _EmitDisplacement:
EMIT_BYTE(0x01); EMIT_BYTE(0x01);
else // if (dispSize == 4) else // if (dispSize == 4)
EMIT_DWORD(0x04040404); EMIT_DWORD(0x04040404);
if (imLen != 0)
goto _EmitImm;
} }
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
@@ -4138,9 +4143,9 @@ _EmitDone:
X86Assembler_dumpInstruction(sb, Arch, code, options, o0, o1, o2, o3, loggerOptions); X86Assembler_dumpInstruction(sb, Arch, code, options, o0, o1, o2, o3, loggerOptions);
if ((loggerOptions & (1 << kLoggerOptionBinaryForm)) != 0) if ((loggerOptions & (1 << kLoggerOptionBinaryForm)) != 0)
X86Assembler_dumpComment(sb, sb.getLength(), self->_cursor, (intptr_t)(cursor - self->_cursor), dispSize, self->_comment); X86Assembler_dumpComment(sb, sb.getLength(), self->_cursor, (intptr_t)(cursor - self->_cursor), dispSize, imLen, self->_comment);
else else
X86Assembler_dumpComment(sb, sb.getLength(), NULL, 0, 0, self->_comment); X86Assembler_dumpComment(sb, sb.getLength(), NULL, 0, 0, 0, self->_comment);
# if defined(ASMJIT_DEBUG) # if defined(ASMJIT_DEBUG)
if (self->_logger) if (self->_logger)