Skip to content

Commit 01dd807

Browse files
committed
remove unnecessary semicolons in asm
1 parent 342cc46 commit 01dd807

File tree

2 files changed

+54
-54
lines changed

2 files changed

+54
-54
lines changed

runtime/druntime/src/core/thread/fiber.d

+42-42
Original file line numberDiff line numberDiff line change
@@ -366,55 +366,55 @@ private
366366
asm pure nothrow @nogc
367367
{
368368
`// save current stack state (similar to posix version in threadasm.S)
369-
stp x19, x20, [sp, #-16]!;
370-
stp x21, x22, [sp, #-16]!;
371-
stp x23, x24, [sp, #-16]!;
372-
stp x25, x26, [sp, #-16]!;
373-
stp x27, x28, [sp, #-16]!;
374-
stp fp, lr, [sp, #-16]!;
375-
mov x19, sp; // no need to scan FP registers, so snapshot sp here
376-
377-
stp d8, d9, [sp, #-16]!;
378-
stp d10, d11, [sp, #-16]!;
379-
stp d12, d13, [sp, #-16]!;
380-
stp d14, d15, [sp, #-16]!;
381-
382-
ldr x20, [x18, #8]; // read stack range from TEB
383-
ldr x21, [x18, #16];
384-
stp x20, x21, [sp, #-16]!;
385-
386-
ldr x20, [x18, #0x1478]; // read Deallocation Stack
387-
ldr w21, [x18, #0x1748]; // read GuaranteedStackBytes
388-
stp x20, x21, [sp, #-16]!;
369+
stp x19, x20, [sp, #-16]!
370+
stp x21, x22, [sp, #-16]!
371+
stp x23, x24, [sp, #-16]!
372+
stp x25, x26, [sp, #-16]!
373+
stp x27, x28, [sp, #-16]!
374+
stp fp, lr, [sp, #-16]!
375+
mov x19, sp // no need to scan FP registers, so snapshot sp here
376+
377+
stp d8, d9, [sp, #-16]!
378+
stp d10, d11, [sp, #-16]!
379+
stp d12, d13, [sp, #-16]!
380+
stp d14, d15, [sp, #-16]!
381+
382+
ldr x20, [x18, #8] // read stack range from TEB
383+
ldr x21, [x18, #16]
384+
stp x20, x21, [sp, #-16]!
385+
386+
ldr x20, [x18, #0x1478] // read Deallocation Stack
387+
ldr w21, [x18, #0x1748] // read GuaranteedStackBytes
388+
stp x20, x21, [sp, #-16]!
389389
390390
// store oldp
391-
str x19, [x0];
391+
str x19, [x0]
392392
// load newp to begin context switch
393-
sub x1, x1, #6*16;
394-
mov sp, x1;
393+
sub x1, x1, #6*16
394+
mov sp, x1
395395
396-
ldp x20, x21, [sp], #16; // restore Deallocation/GuaranteedStackBytes
397-
str x20, [x18, #0x1478];
398-
str w21, [x18, #0x1748]; // word only
396+
ldp x20, x21, [sp], #16 // restore Deallocation/GuaranteedStackBytes
397+
str x20, [x18, #0x1478]
398+
str w21, [x18, #0x1748] // word only
399399
400-
ldp x20, x21, [sp], #16; // restore stack range
401-
str x20, [x18, #8];
402-
str x21, [x18, #16];
400+
ldp x20, x21, [sp], #16 // restore stack range
401+
str x20, [x18, #8]
402+
str x21, [x18, #16]
403403
404404
// load saved state from new stack
405-
ldp d14, d15, [sp], #16;
406-
ldp d12, d13, [sp], #16;
407-
ldp d10, d11, [sp], #16;
408-
ldp d8, d9, [sp], #16;
409-
410-
ldp fp, lr, [sp], #16;
411-
ldp x27, x28, [sp], #16;
412-
ldp x25, x26, [sp], #16;
413-
ldp x23, x24, [sp], #16;
414-
ldp x21, x22, [sp], #16;
415-
ldp x19, x20, [sp], #16;
416-
417-
ret;`;
405+
ldp d14, d15, [sp], #16
406+
ldp d12, d13, [sp], #16
407+
ldp d10, d11, [sp], #16
408+
ldp d8, d9, [sp], #16
409+
410+
ldp fp, lr, [sp], #16
411+
ldp x27, x28, [sp], #16
412+
ldp x25, x26, [sp], #16
413+
ldp x23, x24, [sp], #16
414+
ldp x21, x22, [sp], #16
415+
ldp x19, x20, [sp], #16
416+
417+
ret`;
418418
}
419419
}
420420
else

runtime/druntime/src/ldc/eh_msvc.d

+12-12
Original file line numberDiff line numberDiff line change
@@ -544,24 +544,24 @@ void msvc_eh_terminate() nothrow @naked
544544
{
545545
asm pure nothrow @nogc
546546
{`
547-
bl _D3ldc7eh_msvc21tlsUncaughtExceptionsFNbZm;
548-
cmp w0, #0;
549-
ble 1f;
547+
bl _D3ldc7eh_msvc21tlsUncaughtExceptionsFNbZm
548+
cmp w0, #0
549+
ble 1f
550550
551551
// hacking into the call chain to return EXCEPTION_EXECUTE_HANDLER
552552
// as the return value of __FrameUnwindFilter so that
553553
// __FrameUnwindToState continues with the next unwind block
554-
ldr x0, [fp]; // __FrameUnwindFilter's fp
555-
mov sp, x0;
556-
mov w0, #1; // return EXCEPTION_EXECUTE_HANDLER
557-
ldp fp,lr,[sp],#16;
558-
ldp x19,x20,[sp],#0x10;
559-
autibsp; // uses lr,sp and x19 as input to hash
560-
ret;
554+
ldr x0, [fp] // __FrameUnwindFilter's fp
555+
mov sp, x0
556+
mov w0, #1 // return EXCEPTION_EXECUTE_HANDLER
557+
ldp fp,lr,[sp],#16
558+
ldp x19,x20,[sp],#0x10
559+
autibsp // uses lr,sp and x19 as input to hash
560+
ret
561561
562562
1:
563-
ldp fp,lr,[sp],#16;
564-
ret;`
563+
ldp fp,lr,[sp],#16
564+
ret`
565565
: : : "x0", "x19", "x20";
566566
}
567567
}

0 commit comments

Comments
 (0)