Skip to content

Commit b74627c

Browse files
authored
fix vet error (#53)
1 parent d01b45b commit b74627c

File tree

3 files changed

+8
-23
lines changed

3 files changed

+8
-23
lines changed

kernel/asm.s

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@ TEXT ·gdt_init(SB), NOSPLIT, $0
7979
RET
8080

8181
TEXT ·set_fs(SB), NOSPLIT, $0-4
82-
MOVW idx+0(FP), AX
82+
MOVL idx+0(FP), AX
8383
SHLL $3, AX
8484
ADDL $3, AX
8585
MOVW AX, FS
8686
RET
8787

8888
TEXT ·set_gs(SB), NOSPLIT, $0-4
89-
MOVW idx+0(FP), AX
89+
MOVL idx+0(FP), AX
9090
SHLL $3, AX
9191
ADDL $3, AX
9292
MOVW AX, GS
@@ -138,23 +138,8 @@ TEXT ·callSigHandler(SB), NOSPLIT, $0-20
138138
POPL BP
139139
RET
140140

141-
// func call(pc,a0,a1,a2 uintptr)
142-
TEXT ·call(SB), NOSPLIT, $12-16
143-
MOVL pc+0(FP), CX
144-
145-
MOVL a0+4(FP), AX
146-
MOVL AX, 0(SP)
147-
148-
MOVL a1+8(FP), AX
149-
MOVL AX, 4(SP)
150-
151-
MOVL a2+12(FP), AX
152-
MOVL AX, 8(SP)
153-
CALL CX
154-
RET
155-
156141
TEXT ·set_mythread(SB), NOSPLIT, $4-4
157-
MOVL tid+0(FP), AX
142+
MOVL t+0(FP), AX
158143
MOVL AX, 0(FS)
159144
MOVL AX, 0(SP)
160145
CALL ·switchThreadContext(SB)
@@ -169,7 +154,7 @@ TEXT ·sys_clone(SB), NOSPLIT, $0-12
169154
// In parent, return.
170155
CMPL AX, $0
171156
JEQ 3(PC)
172-
MOVL AX, tid+8(FP)
157+
MOVL AX, ret+8(FP)
173158
RET
174159

175160
NOP SP // tell vet SP changed - stop checking offsets

sys/sys.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const PageSize = 4 << 10
1010
func Outb(port uint16, data byte)
1111

1212
//go:nosplit
13-
func Inb(reg uint16) byte
13+
func Inb(port uint16) byte
1414

1515
//go:nosplit
1616
func Outl(port uint16, data uint32)

sys/sys.s

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ TEXT ·Outb(SB), NOSPLIT, $0-3
88
RET
99

1010
// byte Inb(reg uint16)
11-
TEXT ·Inb(SB), NOSPLIT, $0-3
11+
TEXT ·Inb(SB), NOSPLIT, $0-5
1212
MOVW port+0(FP), DX
1313
XORW AX, AX
1414
INB
15-
MOVW AX, ret+4(FP)
15+
MOVB AX, ret+4(FP)
1616
RET
1717

1818
// Outl(port uint16, data uint32)
1919
TEXT ·Outl(SB), NOSPLIT, $0-8
2020
MOVW port+0(FP), DX
21-
MOVL b+4(FP), AX
21+
MOVL data+4(FP), AX
2222
OUTL
2323
RET
2424

0 commit comments

Comments
 (0)