Re: Experimental fix for my memcpy_{to,from}fs problem

[Eduardo Pereira Habkost <ehabkost@conectiva.com.br>]

[-- Attachment #1: Type: text/plain, Size: 2581 bytes --]

Hi, Mike,

On Thu, Jun 03, 2004 at 08:02:18AM -0600, Miguel Bolanos wrote:
> Applied, but i did some changes on the patch, please read bellow.
> 
> > 
> > 
> > --- elks/arch/i86/mm/user.c	2 Jun 2004 03:06:01 -0000	1.16
> > +++ elks/arch/i86/mm/user.c	2 Jun 2004 15:10:16 -0000
> > @@ -39,11 +39,11 @@
> >  	mov	dx,es
> >  	mov	bx,ds
> >  	mov	es,bx
> > -	mov	ax,[bp-2]	! source segment (local variable)
> > +	mov	ax,[bp+.memcpy_fromfs.ds]	! source segment (local variable)
> >  	mov	ds,ax
> > -	mov	di,[bp+4]	! destination address
> > -	mov	si,[bp+6]	! source address
> > -	mov	cx,[bp+8]	! number of bytes to copy
> > +	mov	di,[bp+.memcpy_fromfs.daddr]	! destination address
> > +	mov	si,[bp+.memcpy_fromfs.saddr]	! source address
> > +	mov	cx,[bp+.memcpy_fromfs.len]	! number of bytes to copy
> >  	cld
> >  	rep
> >  	movsb
> 
> This was already applied on a the previous patch

I think I am missing something. What was applied? The code on CVS is not
using .<function>.<variable> to access the function parameters and
variables. This is what is being changed.

> 
> > @@ -77,11 +77,11 @@
> >  	push	si
> >  	push	di
> >  	mov	dx,es
> > -	mov	ax,[bp-2]	! source segment (local variable)
> > +	mov	ax,[bp+.memcpy_tofs.es]	! source segment (local variable)
> >  	mov	es,ax
> > -	mov	di,[bp+4]	! destination address
> > -	mov	si,[bp+6]	! source address
> > -	mov	cx,[bp+8]	! number of bytes to copy
> > +	mov	di,[bp+.memcpy_tofs.daddr]	! destination address
> > +	mov	si,[bp+.memcpy_tofs.saddr]	! source address
> > +	mov	cx,[bp+.memcpy_tofs.len]	! number of bytes to copy
> >  	cld
> >  	rep
> >  	movsb
> 
> This was already done as well.

The CVS don't contain these changes, too. I just 'cvs update'd.

> 
> > @@ -167,17 +167,17 @@
> >  #ifndef S_SPLINT_S
> >  #asm
> >  
> > -	mov	ax,[bp-6]	! source segment (local variable)
> > +	mov	ax,[bp+.strlen_fromfs.ds]	! source segment (local variable)
> >  	mov	es,ax
> > -	mov	di,[bp+4]	! source address
> > +	mov	di,[bp+.strlen_fromfs.saddr]	! source address
> >  	cld
> >  	xor	al,al		! search for NULL byte
> >  	mov	cx,#-1
> >  	rep
> >  	scasb
> > -	sub	di,[bp+4]	! calc len +1
> > +	sub	di,[bp+.strlen_fromfs.saddr]	! calc len +1
> >  	dec	di
> > -	mov	[bp-6],di	! save in local var ds
> > +	mov	[bp+.strlen_fromfs.ds],di	! save in local var ds
> >  #endasm
> >  #endif
> >  
> 
> This part was applied.

The changes are on CVS? I did an 'cvs update', and the last revision of
user.c (1.17) doesn't contain any of these changes.

-- 
Eduardo

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]