From: Alan Cox <alan@etchedpixels.co.uk>
Date: Sat, 29 Nov 2014 14:26:17 +0000 (+0000)
Subject: usermem_sam: Bug fixes
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=9b442847;p=FUZIX.git

usermem_sam: Bug fixes

Correct uput
Add interrupt masking otherwise we can take an IRQ while we are within a
usermem access with no valid stack. At that point we crapped a stack frame
somewhere in the wrong memory bank.
---

diff --git a/Kernel/platform-dragon/usermem_sam.s b/Kernel/platform-dragon/usermem_sam.s
index b21ecf5b..bd0f5109 100644
--- a/Kernel/platform-dragon/usermem_sam.s
+++ b/Kernel/platform-dragon/usermem_sam.s
@@ -23,23 +23,28 @@
 	.area .common
 
 __ugetc:
+	pshs cc		; save IRQ state
+	orcc #0x10
 	SAM_USER
 	ldb ,x
+	SAM_KERNEL
 	lda #0
 	tfr d,x
-	SAM_KERNEL
-	rts
+	puls cc,pc	; back and return
 
 __ugetw:
+	pshs cc
+	orcc #0x10
 	SAM_USER
 	ldx ,x
 	SAM_KERNEL
-	rts
+	puls cc,pc
 
 __uget:
-	pshs u,y
-	ldu 6,s		; user address
-	ldy 8,s		; count
+	pshs u,y,cc
+	ldu 8,s		; user address
+	ldy 10,s	; count
+	orcc #0x10
 ugetl:
 	lda ,x++
 	SAM_USER
@@ -48,12 +53,13 @@ ugetl:
 	leay -1,y
 	cmpy #0
 	bne ugetl
-	puls u,y,pc
+	puls u,y,cc,pc
 
 __ugets:
-	pshs u,y
-	ldu 6,s		; user address
-	ldy 8,s		; count
+	pshs u,y,cc
+	ldu 8,s		; user address
+	ldy 10,s		; count
+	orcc #0x10
 ugetsl:
 	SAM_USER
 	lda ,x++
@@ -66,46 +72,56 @@ ugetsl:
 	ldx #0xffff	; unterminated - error
 	lda #0
 	sta -1,u	; force termination
-	puls u,y,pc
+	puls u,y,cc,pc
 
 ugetse:
 	SAM_KERNEL
 	sta ,u
 	ldx #0
-	puls u,y,pc
+	puls u,y,cc,pc
 
 
 __uputc:
+	pshs cc
+	orcc #0x10
+	ldd 4,s
 	SAM_USER
+	exg d,x
 	stb ,x
 	SAM_KERNEL
-	rts
+	puls cc,pc
 
 __uputw:
+	pshs cc
+	orcc #0x10
+	ldd 4,s
 	SAM_USER
-	ldb 2,s
-	stb ,x
+	exg d,x
+	std ,x
 	SAM_KERNEL
-	rts
+	puls cc,pc
 
+;	X = source, user, size on stack
 __uput:
-	pshs u,y
-	ldu 6,s		; user address
-	ldy 8,s		; count
+	pshs u,y,cc
+	orcc #0x10
+	ldu 8,s		; user address
+	ldy 10,s	; count
 uputl:
-	SAM_USER
 	lda ,x++
-	SAM_KERNEL
+	SAM_USER
 	sta ,u++
+	SAM_KERNEL
 	leay -1,y
 	cmpy #0
 	bne uputl
-	puls u,y,pc
+	puls u,y,cc,pc
 
 __uzero:
-	pshs y
+	pshs y,cc
 	lda #0
-	ldy 6,s
+	ldy 8,s
+	orcc #0x10
 	SAM_USER
 uzloop:
 	sta ,x+
@@ -113,4 +129,4 @@ uzloop:
 	cmpy #0
 	bne uzloop
 	SAM_KERNEL
-	puls y,pc
+	puls y,cc,pc