aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/s390
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/s390')
-rw-r--r--sysdeps/s390/s390-32/bcopy.S54
-rw-r--r--sysdeps/s390/s390-32/memcpy.S37
-rw-r--r--sysdeps/s390/s390-64/bcopy.S47
-rw-r--r--sysdeps/s390/s390-64/initfini.c4
-rw-r--r--sysdeps/s390/s390-64/memcpy.S34
5 files changed, 98 insertions, 78 deletions
diff --git a/sysdeps/s390/s390-32/bcopy.S b/sysdeps/s390/s390-32/bcopy.S
index 8bf5bbbefa..526e3361d1 100644
--- a/sysdeps/s390/s390-32/bcopy.S
+++ b/sysdeps/s390/s390-32/bcopy.S
@@ -1,4 +1,4 @@
-/* bcopy -- copy a block from source to destination. For IBM S390
+/* bcopy -- copy a block from source to destination. S/390 version.
This file is part of the GNU C Library.
Copyright (C) 2000, 2001 Free Software Foundation, Inc.
Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
@@ -18,48 +18,53 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-/*
- * R2 = address of source
- * R3 = address of destination
- * R4 = number of bytes to copy
- */
+/* INPUT PARAMETERS
+ %r2 = address of source
+ %r3 = address of destination
+ %r4 = number of bytes to copy. */
#include "sysdep.h"
#include "asm-syntax.h"
.text
ENTRY(__bcopy)
+ ltr %r1,%r4 # zero bcopy ?
+ jz .L4
clr %r2,%r3 # check against destructive overlap
jnl .L0
- lr %r1,%r2
- alr %r1,%r4
+ alr %r1,%r2
clr %r1,%r3
- jh .L2
-.L0:
- lr %r5,%r4 # source length
- lr %r4,%r2 # source address
- sr %r1,%r1 # set pad byte to zero
- lr %r2,%r3 # set destination
- lr %r3,%r5 # destination length = source length
-.L1: mvcle %r2,%r4,0(%r1) # thats it, MVCLE is your friend
- jo .L1
- br %r14
-.L2: # destructive overlay, can not use mvcle
+ jh .L5
+.L0: ahi %r4,-1 # length - 1
+ lr %r1,%r4
+ srl %r1,8
+ ltr %r1,%r1
+ jz .L2
+.L1: mvc 0(256,%r3),0(%r2) # move in 256 byte chunks
+ la %r2,256(%r2)
+ la %r3,256(%r3)
+ brct %r1,.L1
+.L2: bras %r1,.L3 # setup base pointer for execute
+ mvc 0(1,%r3),0(%r2) # instruction for execute
+.L3: ex %r4,0(%r1) # execute mvc with length ((%r4)&255)+1
+.L4: br %r14
+
+.L5: # destructive overlay, can not use mvcle
lr %r1,%r2 # bcopy is called with source,dest
lr %r2,%r3 # memmove with dest,source! Oh, well...
lr %r3,%r1
basr %r1,0
-.L3:
+.L6:
#ifdef PIC
- al %r1,.L4-.L3(%r1) # get address of global offset table
+ al %r1,.L7-.L6(%r1) # get address of global offset table
# load address of memmove
l %r1,memmove@GOT12(%r1)
br %r1
-.L4: .long _GLOBAL_OFFSET_TABLE_-.L3
+.L7: .long _GLOBAL_OFFSET_TABLE_-.L6
#else
- al %r1,.L4-.L3(%r1) # load address of memmove
+ al %r1,.L7-.L6(%r1) # load address of memmove
br %r1 # jump to memmove
-.L4: .long memmove-.L3
+.L7: .long memmove-.L6
#endif
END(__bcopy)
@@ -67,3 +72,4 @@ END(__bcopy)
#ifndef NO_WEAK_ALIAS
weak_alias (__bcopy, bcopy)
#endif
+
diff --git a/sysdeps/s390/s390-32/memcpy.S b/sysdeps/s390/s390-32/memcpy.S
index 4bbec7c633..9c4b840928 100644
--- a/sysdeps/s390/s390-32/memcpy.S
+++ b/sysdeps/s390/s390-32/memcpy.S
@@ -1,4 +1,4 @@
-/* Set a block of memory to some byte value. For IBM S390
+/* memcpy - copy a block from source to destination. S/390 version.
Copyright (C) 2000, 2001 Free Software Foundation, Inc.
Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
@@ -17,25 +17,30 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-/*
- * R2 = address to destination memory area
- * R3 = address to source memory area
- * R4 = number of bytes to copy
- */
+/* INPUT PARAMETERS
+ %r2 = address of destination memory area
+ %r3 = address of source memory area
+ %r4 = number of bytes to copy. */
#include "sysdep.h"
#include "asm-syntax.h"
.text
ENTRY(memcpy)
- ltr %r5,%r4
+ ltr %r4,%r4
+ jz .L3
+ ahi %r4,-1 # length - 1
+ lr %r1,%r2 # copy destination address
+ lr %r5,%r4
+ sra %r5,8
jz .L1
- lr %r4,%r3 # %r4/%r5 = source ptr/len
- lr %r3,%r5 # %r2/%r3 = dest ptr/len
- lr %r0,%r2 # save source address
-.L0: mvcle %r2,%r4,0 # thats it, MVCLE is your friend
- jo .L0
- lr %r2,%r0 # return value is source address
-.L1:
- br %r14
-END(memset)
+.L0: mvc 0(256,%r1),0(%r3) # move in 256 byte chunks
+ la %r1,256(%r1)
+ la %r3,256(%r3)
+ brct %r5,.L0
+.L1: bras %r5,.L2 # setup base pointer for execute
+ mvc 0(1,%r1),0(%r3) # instruction for execute
+.L2: ex %r4,0(%r5) # execute mvc with length ((%r4)&255)+1
+.L3: br %r14
+END(memcpy)
+
diff --git a/sysdeps/s390/s390-64/bcopy.S b/sysdeps/s390/s390-64/bcopy.S
index 5cb02b3162..0d75d3ea9f 100644
--- a/sysdeps/s390/s390-64/bcopy.S
+++ b/sysdeps/s390/s390-64/bcopy.S
@@ -1,6 +1,6 @@
/* bcopy -- copy a block from source to destination. 64 bit S/390 version.
This file is part of the GNU C Library.
- Copyright (C) 2001 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2001 Free Software Foundation, Inc.
Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
The GNU C Library is free software ; you can redistribute it and/or
@@ -26,27 +26,32 @@
#include "sysdep.h"
#include "asm-syntax.h"
- .text
+ .text
ENTRY(__bcopy)
- clgr %r2,%r3 # check against destructive overlap
- jnl .L0
- lgr %r1,%r2
- algr %r1,%r4
- clgr %r1,%r3
- jh .L2
-.L0:
- lgr %r5,%r4 # source length
- lgr %r4,%r2 # source address
- sgr %r1,%r1 # set pad byte to zero
- lgr %r2,%r3 # set destination
- lgr %r3,%r5 # destination length = source length
-.L1: mvcle %r2,%r4,0(%r1) # thats it, MVCLE is your friend
- jo .L1
- br %r14
-.L2: # destructive overlay, can not use mvcle
- lgr %r1,%r2 # bcopy is called with source,dest
- lgr %r2,%r3 # memmove with dest,source! Oh, well...
- lgr %r3,%r1
+ ltgr %r1,%r4 # zero bcopy ?
+ jz .L4
+ clgr %r2,%r3 # check against destructive overlap
+ jnl .L0
+ algr %r1,%r2
+ clgr %r1,%r3
+ jh .L5
+.L0: aghi %r4,-1 # length - 1
+ srlg %r1,%r4,8
+ ltgr %r1,%r1
+ jz .L2
+.L1: mvc 0(256,%r3),0(%r2) # move in 256 byte chunks
+ la %r2,256(%r2)
+ la %r3,256(%r3)
+ brctg %r1,.L1
+.L2: bras %r1,.L3 # setup base pointer for execute
+ mvc 0(1,%r3),0(%r2) # instruction for execute
+.L3: ex %r4,0(%r1) # execute mvc with length ((%r4)&255)+1
+.L4: br %r14
+
+.L5: # destructive overlay, can not use mvcle
+ lgr %r1,%r2 # bcopy is called with source,dest
+ lgr %r2,%r3 # memmove with dest,source! Oh, well...
+ lgr %r3,%r1
#ifdef PIC
jg memmove@PLT
#else
diff --git a/sysdeps/s390/s390-64/initfini.c b/sysdeps/s390/s390-64/initfini.c
index 3d14b0b283..be5614b203 100644
--- a/sysdeps/s390/s390-64/initfini.c
+++ b/sysdeps/s390/s390-64/initfini.c
@@ -68,8 +68,8 @@ _init:
AGHI 15,-160
STG 1,0(15)
LARL 12,_GLOBAL_OFFSET_TABLE_
- LGHI 1,__gmon_start__@GOT
- LG 1,0(1,12)
+ LARL 1,__gmon_start__@GOTENT
+ LG 1,0(1)
LTGR 1,1
JE .L22
BASR 14,1
diff --git a/sysdeps/s390/s390-64/memcpy.S b/sysdeps/s390/s390-64/memcpy.S
index c59d3fbb79..008f026909 100644
--- a/sysdeps/s390/s390-64/memcpy.S
+++ b/sysdeps/s390/s390-64/memcpy.S
@@ -1,7 +1,6 @@
-/* Set a block of memory to some byte value. 64 bit S/390 version.
- Copyright (C) 2001 Free Software Foundation, Inc.
+/* memcpy - copy a block from source to destination. 64 bit S/390 version.
+ Copyright (C) 2000, 2001 Free Software Foundation, Inc.
Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
- This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
@@ -19,8 +18,8 @@
Boston, MA 02111-1307, USA. */
/* INPUT PARAMETERS
- %r2 = address to destination memory area
- %r3 = address to source memory area
+ %r2 = address of destination memory area
+ %r3 = address of source memory area
%r4 = number of bytes to copy. */
#include "sysdep.h"
@@ -28,14 +27,19 @@
.text
ENTRY(memcpy)
- ltgr %r5,%r4
+ ltgr %r4,%r4
+ jz .L3
+ aghi %r4,-1 # length - 1
+ lgr %r1,%r2 # copy destination address
+ srag %r5,%r4,8
jz .L1
- lgr %r4,%r3 # %r4/%r5 = source ptr/len
- lgr %r3,%r5 # %r2/%r3 = dest ptr/len
- lgr %r0,%r2 # save source address
-.L0: mvcle %r2,%r4,0 # thats it, MVCLE is your friend
- jo .L0
- lgr %r2,%r0 # return value is source address
-.L1:
- br %r14
-END(memset)
+.L0: mvc 0(256,%r1),0(%r3) # move in 256 byte chunks
+ la %r1,256(%r1)
+ la %r3,256(%r3)
+ brctg %r5,.L0
+.L1: bras %r5,.L2 # setup base pointer for execute
+ mvc 0(1,%r1),0(%r3) # instruction for execute
+.L2: ex %r4,0(%r5) # execute mvc with length ((%r4)&255)+1
+.L3: br %r14
+END(memcpy)
+