Skip to content

Commit 19f0a63

Browse files
committed
---
yaml --- r: 5913 b: refs/heads/master c: 160c56e h: refs/heads/master i: 5911: 9a09eb8 v: v3
1 parent 4dcd62d commit 19f0a63

File tree

7 files changed

+146
-146
lines changed

7 files changed

+146
-146
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 93d940de54cc90ea7bd5fecd3970d2466988199b
2+
refs/heads/master: 160c56e76870efd9d1bf836e609f8bae092f9269

trunk/mk/tests.mk

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,18 +82,17 @@ check-fast: tidy \
8282
tidy:
8383
@$(call E, check: formatting)
8484
$(Q)echo \
85-
$(filter-out $(GENERATED) $(addprefix $(S)src/, $(GENERATED)) \
8685
$(addprefix $(S)src/, $(RUSTLLVM_LIB_CS) $(RUSTLLVM_OBJS_CS) \
87-
$(RUSTLLVM_HDR) $(PKG_3RDPARTY) \
86+
$(RUSTLLVM_HDR) \
8887
$(RUNTIME_CS) $(RUNTIME_HDR) $(RUNTIME_S)) \
89-
$(S)src/etc/%, \
88+
$(wildcard $(S)src/etc/*.py) \
9089
$(COMPILER_CRATE) \
9190
$(COMPILER_INPUTS) \
9291
$(STDLIB_CRATE) \
9392
$(STDLIB_INPUTS) \
9493
$(COMPILETEST_CRATE) \
9594
$(COMPILETEST_INPUTS) \
96-
$(ALL_TEST_INPUTS)) \
95+
$(ALL_TEST_INPUTS) \
9796
| xargs -n 10 python $(S)src/etc/tidy.py
9897

9998

trunk/src/rt/arch/i386/_context.S

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,76 @@
1-
.text
1+
.text
22

33
/*
44
Callee save registers:
5-
ebp, ebx, esi, edi
5+
ebp, ebx, esi, edi
66
77
Caller save registers:
8-
eax, ecx, edx
8+
eax, ecx, edx
99
*/
10-
10+
1111
/*
1212
Saves a set of registers. This is used by our implementation of
1313
getcontext.
1414
1515
The registers_t variable is in (%esp)
16-
*/
16+
*/
1717

1818
// swap_registers(registers_t *oregs, registers_t *regs)
1919
.globl swap_registers
2020
swap_registers:
2121
// save the old context
2222
movl 4(%esp), %eax
23-
//movl %eax, 0(%eax)
24-
movl %ebx, 4(%eax)
25-
movl %ecx, 8(%eax)
26-
movl %edx, 12(%eax)
27-
movl %ebp, 16(%eax)
28-
movl %esi, 20(%eax)
29-
movl %edi, 24(%eax)
30-
//movl %cs, 32(%eax)
31-
//movl %ds, 34(%eax)
32-
//movl %ss, 36(%eax)
33-
//movl %es, 38(%eax)
34-
//movl %fs, 40(%eax)
35-
//movl %gs, 42(%eax)
23+
//movl %eax, 0(%eax)
24+
movl %ebx, 4(%eax)
25+
movl %ecx, 8(%eax)
26+
movl %edx, 12(%eax)
27+
movl %ebp, 16(%eax)
28+
movl %esi, 20(%eax)
29+
movl %edi, 24(%eax)
30+
//movl %cs, 32(%eax)
31+
//movl %ds, 34(%eax)
32+
//movl %ss, 36(%eax)
33+
//movl %es, 38(%eax)
34+
//movl %fs, 40(%eax)
35+
//movl %gs, 42(%eax)
3636

37-
// save the flags
38-
pushf
39-
popl %ecx
40-
movl %ecx, 44(%eax)
37+
// save the flags
38+
pushf
39+
popl %ecx
40+
movl %ecx, 44(%eax)
4141

42-
// save the return address as the instruction pointer
42+
// save the return address as the instruction pointer
4343
// and save the stack pointer of the caller
4444
popl %ecx
4545
movl %esp, 28(%eax)
46-
movl %ecx, 48(%eax)
46+
movl %ecx, 48(%eax)
4747

4848
// restore the new context
4949
movl 4(%esp), %eax
5050

51-
movl 4(%eax), %ebx
52-
// save ecx for later...
53-
movl 12(%eax), %edx
54-
movl 16(%eax), %ebp
55-
movl 20(%eax), %esi
56-
movl 24(%eax), %edi
57-
movl 28(%eax), %esp
58-
// We can't actually change this...
59-
//movl 32(%eax), %cs
60-
//movl 34(%eax), %ds
61-
//movl 36(%eax), %ss
62-
//movl 38(%eax), %es
63-
//movl 40(%eax), %fs
64-
//movl 42(%eax), %gs
51+
movl 4(%eax), %ebx
52+
// save ecx for later...
53+
movl 12(%eax), %edx
54+
movl 16(%eax), %ebp
55+
movl 20(%eax), %esi
56+
movl 24(%eax), %edi
57+
movl 28(%eax), %esp
58+
// We can't actually change this...
59+
//movl 32(%eax), %cs
60+
//movl 34(%eax), %ds
61+
//movl 36(%eax), %ss
62+
//movl 38(%eax), %es
63+
//movl 40(%eax), %fs
64+
//movl 42(%eax), %gs
6565

66-
// restore the flags
67-
movl 44(%eax), %ecx
68-
push %ecx
69-
popf
66+
// restore the flags
67+
movl 44(%eax), %ecx
68+
push %ecx
69+
popf
7070

7171
// ok, now we can restore ecx
7272
movl 8(%eax), %ecx
73-
73+
7474
// Return!
7575
jmp *48(%eax)
7676

0 commit comments

Comments
 (0)