Skip to content

Commit fbc0922

Browse files
committed
Use att_syntax for now
1 parent 51971a2 commit fbc0922

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

src/mem/x86_64.rs

+13-13
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,23 @@ pub unsafe fn copy_forward(mut dest: *mut u8, mut src: *const u8, count: usize)
4646
inout("ecx") pre_byte_count => _,
4747
inout("rdi") dest => dest,
4848
inout("rsi") src => src,
49-
options(nostack, preserves_flags)
49+
options(att_syntax, nostack, preserves_flags)
5050
);
5151
}
5252
asm!(
5353
"rep movsq",
5454
inout("rcx") qword_count => _,
5555
inout("rdi") dest => dest,
5656
inout("rsi") src => src,
57-
options(nostack, preserves_flags)
57+
options(att_syntax, nostack, preserves_flags)
5858
);
5959
if byte_count > 0 {
6060
asm!(
6161
"rep movsb",
6262
inout("ecx") byte_count => _,
6363
inout("rdi") dest => _,
6464
inout("rsi") src => _,
65-
options(nostack, preserves_flags)
65+
options(att_syntax, nostack, preserves_flags)
6666
);
6767
}
6868
}
@@ -74,13 +74,13 @@ pub unsafe fn copy_backward(dest: *mut u8, src: *const u8, count: usize) {
7474
asm!(
7575
"std",
7676
"rep movsb",
77-
"sub rsi, 7",
78-
"sub rdi, 7",
79-
"mov rcx, {qword_count}",
77+
"sub $7, %rsi",
78+
"sub $7, %rdi",
79+
"mov {qword_count}, %rcx",
8080
"rep movsq",
81-
"add rsi, 7",
82-
"add rdi, 7",
83-
"mov ecx, {pre_byte_count:e}",
81+
"add $7, %rsi",
82+
"add $7, %rdi",
83+
"mov {pre_byte_count:e}, %ecx",
8484
"rep movsb",
8585
"cld",
8686
pre_byte_count = in(reg) pre_byte_count,
@@ -89,7 +89,7 @@ pub unsafe fn copy_backward(dest: *mut u8, src: *const u8, count: usize) {
8989
inout("rdi") dest.add(count - 1) => _,
9090
inout("rsi") src.add(count - 1) => _,
9191
// We modify flags, but we restore it afterwards
92-
options(nostack, preserves_flags)
92+
options(att_syntax, nostack, preserves_flags)
9393
);
9494
}
9595

@@ -120,23 +120,23 @@ pub unsafe fn set_bytes(mut dest: *mut u8, c: u8, count: usize) {
120120
inout("ecx") pre_byte_count => _,
121121
inout("rdi") dest => dest,
122122
in("rax") c,
123-
options(nostack, preserves_flags)
123+
options(att_syntax, nostack, preserves_flags)
124124
);
125125
}
126126
asm!(
127127
"rep stosq",
128128
inout("rcx") qword_count => _,
129129
inout("rdi") dest => dest,
130130
in("rax") c,
131-
options(nostack, preserves_flags)
131+
options(att_syntax, nostack, preserves_flags)
132132
);
133133
if byte_count > 0 {
134134
asm!(
135135
"rep stosb",
136136
inout("ecx") byte_count => _,
137137
inout("rdi") dest => _,
138138
in("rax") c,
139-
options(nostack, preserves_flags)
139+
options(att_syntax, nostack, preserves_flags)
140140
);
141141
}
142142
}

0 commit comments

Comments
 (0)