Skip to content

MSVC: Fix extended ptr semantics in DMD-style inline asm #2653

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.

Sign up for GitHub

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

Merged
kinke merged 1 commit into from
Apr 15, 2018
Merged

MSVC: Fix extended ptr semantics in DMD-style inline asm #2653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions gen/asm-x86.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2558,12 +2558,7 @@ struct AsmProcessor {
type_suffix = 'l';
break;
case Extended_Ptr:
// MS C runtime: real = 64-bit double
if (global.params.targetTriple->isWindowsMSVCEnvironment()) {
type_suffix = 'l';
} else {
type_suffix = 't';
}
type_suffix = 't';
break;
default:
return false;
Expand Down Expand Up @@ -3195,7 +3190,8 @@ struct AsmProcessor {
// Tfloat64
TY ty = v->type->toBasetype()->ty;
operand->dataSizeHint =
ty == Tfloat80 || ty == Timaginary80
(ty == Tfloat80 || ty == Timaginary80) &&
!global.params.targetTriple->isWindowsMSVCEnvironment()
? Extended_Ptr
: static_cast<PtrType>(v->type->size(Loc()));
}
Expand Down Expand Up @@ -3616,7 +3612,9 @@ struct AsmProcessor {
case TOKfloat64:
return Double_Ptr;
case TOKfloat80:
return Extended_Ptr;
return global.params.targetTriple->isWindowsMSVCEnvironment()
? Double_Ptr
: Extended_Ptr;
case TOKidentifier:
for (int i = 0; i < N_PtrNames; i++) {
if (tok->ident == ptrTypeIdentTable[i]) {
Expand Down
40 changes: 40 additions & 0 deletions tests/codegen/dmd_inline_asm_fp_types.d
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
// REQUIRES: target_X86

// RUN: %ldc -output-s -mtriple=x86_64-windows-msvc -of=%t_msvc.s %s
// RUN: FileCheck --check-prefix=COMMON --check-prefix=MSVC %s < %t_msvc.s
// RUN: %ldc -output-s -mtriple=x86_64-linux-gnu -of=%t_linux.s %s
// RUN: FileCheck --check-prefix=COMMON --check-prefix=LINUX %s < %t_linux.s

// COMMON: _D23dmd_inline_asm_fp_types3fooFfdeZv
void foo(float a, double b, real c)
{
asm
{
// COMMON: flds
fld a;
// COMMON-NEXT: fldl
fld b;
// MSVC-NEXT: fldl
// LINUX-NEXT: fldt
fld c;
ret;
}
}

// COMMON: _D23dmd_inline_asm_fp_types3barFPvZv
void bar(void* ptr)
{
asm
{
// COMMON: flds
fld float ptr [ptr];
// COMMON-NEXT: fldl
fld double ptr [ptr];
// MSVC-NEXT: fldl
// LINUX-NEXT: fldt
fld real ptr [ptr];
// COMMON-NEXT: fldt
fld extended ptr [ptr];
ret;
}
}