mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-19 16:10:01 +00:00
Update.
2000-05-23 Ulrich Drepper <drepper@redhat.com> * elf/Makefile (tests): Add $(tests-vis-$(have-protected)). (tests-vis-yes): Add vismain. (modules-names): Add $(modules-vis-$(have-protected)). (modules-vis-yes): Add vismod1, vismod2, and vismod3. Add rules to generate and run vismain. * elf/vismain.c: New file. * elf/vismod1.c: New file. * elf/vismod2.c: New file. * elf/vismod3.c: New file.
This commit is contained in:
parent
c1025c1980
commit
eec8ef5a73
12
ChangeLog
12
ChangeLog
@ -1,3 +1,15 @@
|
||||
2000-05-23 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* elf/Makefile (tests): Add $(tests-vis-$(have-protected)).
|
||||
(tests-vis-yes): Add vismain.
|
||||
(modules-names): Add $(modules-vis-$(have-protected)).
|
||||
(modules-vis-yes): Add vismod1, vismod2, and vismod3.
|
||||
Add rules to generate and run vismain.
|
||||
* elf/vismain.c: New file.
|
||||
* elf/vismod1.c: New file.
|
||||
* elf/vismod2.c: New file.
|
||||
* elf/vismod3.c: New file.
|
||||
|
||||
2000-05-23 Andreas Jaeger <aj@suse.de>
|
||||
|
||||
* stdio-common/tfformat.c (sprint_doubles): Add testcase for %a.
|
||||
|
266
elf/vismain.c
Normal file
266
elf/vismain.c
Normal file
@ -0,0 +1,266 @@
|
||||
/* Copyright (C) 2000 Free Software Foundation, Inc.
|
||||
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
|
||||
published by the Free Software Foundation; either version 2 of the
|
||||
License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Library General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Library General Public
|
||||
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
||||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
/* Prototypes for the functions in the DSOs. */
|
||||
extern int calllocal1 (void);
|
||||
extern int (*getlocal1 (void)) (void);
|
||||
extern int callinmod1 (void);
|
||||
extern int (*getinmod1 (void)) (void);
|
||||
extern int callitcpt1 (void);
|
||||
extern int (*getitcpt1 (void)) (void);
|
||||
extern const char *getvarlocal1 (void);
|
||||
extern const char *getvarinmod1 (void);
|
||||
extern const char *getvaritcpt1 (void);
|
||||
extern int calllocal2 (void);
|
||||
extern int (*getlocal2 (void)) (void);
|
||||
extern int callinmod2 (void);
|
||||
extern int (*getinmod2 (void)) (void);
|
||||
extern int callitcpt2 (void);
|
||||
extern int (*getitcpt2 (void)) (void);
|
||||
extern const char *getvarlocal2 (void);
|
||||
extern const char *getvarinmod2 (void);
|
||||
extern const char *getvaritcpt2 (void);
|
||||
extern int callitcpt3 (void);
|
||||
extern int (*getitcpt3 (void)) (void);
|
||||
extern const char *getvaritcpt3 (void);
|
||||
|
||||
extern int protinmod (void);
|
||||
extern int protitcpt (void);
|
||||
|
||||
/* Prototypes for local functions. */
|
||||
extern int protlocal (void);
|
||||
|
||||
const char *protvarlocal = __FILE__;
|
||||
extern const char *protvarinmod;
|
||||
extern const char *protvaritcpt;
|
||||
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
int res = 0;
|
||||
int val;
|
||||
|
||||
/* First test: check whether .protected is handled correctly by the
|
||||
assembler/linker. The uses of `protlocal' in the DSOs and in the
|
||||
main program should all be resolved with the local definitions. */
|
||||
val = protlocal () + calllocal1 () + calllocal2 ();
|
||||
if (val != 0x155)
|
||||
{
|
||||
puts ("\
|
||||
The handling of `.protected' seems to be implemented incorrectly: giving up");
|
||||
abort ();
|
||||
}
|
||||
puts ("`.protected' seems to be handled correctly, good!");
|
||||
|
||||
/* Function pointers: for functions which are marked local and for
|
||||
which definitions are available all function pointers must be
|
||||
distinct. */
|
||||
if (protlocal == getlocal1 ())
|
||||
{
|
||||
puts ("`protlocal' in main and mod1 have same address");
|
||||
res = 1;
|
||||
}
|
||||
if (protlocal == getlocal2 ())
|
||||
{
|
||||
puts ("`protlocal' in main and mod2 have same address");
|
||||
res = 1;
|
||||
}
|
||||
if (getlocal1 () == getlocal2 ())
|
||||
{
|
||||
puts ("`protlocal' in mod1 and mod2 have same address");
|
||||
res = 1;
|
||||
}
|
||||
if (getlocal1 () () + getlocal2 () () != 0x44)
|
||||
{
|
||||
puts ("pointers to `protlocal' in mod1 or mod2 incorrect");
|
||||
res = 1;
|
||||
}
|
||||
|
||||
/* Next test. This is similar to the last one but the function we
|
||||
are calling is not defined in the main object. This means that
|
||||
the invocation in the main object uses the definition in the
|
||||
first DSO. */
|
||||
if (protinmod != getinmod1 ())
|
||||
{
|
||||
puts ("`protinmod' in main and mod1 don't have same address");
|
||||
res = 1;
|
||||
}
|
||||
if (protinmod == getinmod2 ())
|
||||
{
|
||||
puts ("`protinmod' in main and mod2 have same address");
|
||||
res = 1;
|
||||
}
|
||||
if (getinmod1 () == getinmod2 ())
|
||||
{
|
||||
puts ("`protinmod' in mod1 and mod2 have same address");
|
||||
res = 1;
|
||||
}
|
||||
if (protinmod () + getinmod1 () () + getinmod2 () () != 0x4800)
|
||||
{
|
||||
puts ("pointers to `protinmod' in mod1 or mod2 incorrect");
|
||||
res = 1;
|
||||
}
|
||||
val = protinmod () + callinmod1 () + callinmod2 ();
|
||||
if (val != 0x15800)
|
||||
{
|
||||
printf ("calling of `protinmod' leads to wrong result (%#x)\n", val);
|
||||
res = 1;
|
||||
}
|
||||
|
||||
/* A very similar text. Same setup for the main object and the modules
|
||||
but this time we have another definition in a preloaded module. This
|
||||
one intercepts the references from the main object. */
|
||||
if (protitcpt != getitcpt3 ())
|
||||
{
|
||||
puts ("`protitcpt' in main and mod3 don't have same address");
|
||||
res = 1;
|
||||
}
|
||||
if (protitcpt == getitcpt1 ())
|
||||
{
|
||||
puts ("`protitcpt' in main and mod1 have same address");
|
||||
res = 1;
|
||||
}
|
||||
if (protitcpt == getitcpt2 ())
|
||||
{
|
||||
puts ("`protitcpt' in main and mod2 have same address");
|
||||
res = 1;
|
||||
}
|
||||
if (getitcpt1 () == getitcpt2 ())
|
||||
{
|
||||
puts ("`protitcpt' in mod1 and mod2 have same address");
|
||||
res = 1;
|
||||
}
|
||||
val = protitcpt () + getitcpt1 () () + getitcpt2 () () + getitcpt3 () ();
|
||||
if (val != 0x8440000)
|
||||
{
|
||||
printf ("\
|
||||
pointers to `protitcpt' in mod1 or mod2 or mod3 incorrect (%#x)\n", val);
|
||||
res = 1;
|
||||
}
|
||||
val = protitcpt () + callitcpt1 () + callitcpt2 () + callitcpt3 ();
|
||||
if (val != 0x19540000)
|
||||
{
|
||||
printf ("calling of `protitcpt' leads to wrong result (%#x)\n", val);
|
||||
res = 1;
|
||||
}
|
||||
|
||||
/* Now look at variables. First a variable which is available
|
||||
everywhere. We must have three different addresses. */
|
||||
if (protvarlocal == getvarlocal1 ())
|
||||
{
|
||||
puts ("`protvarlocal' in main and mod1 have same address");
|
||||
res = 1;
|
||||
}
|
||||
if (protvarlocal == getvarlocal2 ())
|
||||
{
|
||||
puts ("`protvarlocal' in main and mod2 have same address");
|
||||
res = 1;
|
||||
}
|
||||
if (getvarlocal1 () == getvarlocal2 ())
|
||||
{
|
||||
puts ("`protvarlocal' in mod1 and mod2 have same address");
|
||||
res = 1;
|
||||
}
|
||||
if (strcmp (protvarlocal, __FILE__) != 0)
|
||||
{
|
||||
puts ("`protvarlocal in main has wrong value");
|
||||
res = 1;
|
||||
}
|
||||
if (strcmp (getvarlocal1 (), "vismod1.c") != 0)
|
||||
{
|
||||
puts ("`getvarlocal1' returns wrong value");
|
||||
res = 1;
|
||||
}
|
||||
if (strcmp (getvarlocal2 (), "vismod2.c") != 0)
|
||||
{
|
||||
puts ("`getvarlocal2' returns wrong value");
|
||||
res = 1;
|
||||
}
|
||||
|
||||
/* Now the case where there is no local definition. */
|
||||
if (protvarinmod != getvarinmod1 ())
|
||||
{
|
||||
puts ("`protvarinmod' in main and mod1 have not same address");
|
||||
res = 1;
|
||||
}
|
||||
if (protvarinmod == getvarinmod2 ())
|
||||
{
|
||||
puts ("`protvarinmod' in main and mod2 have same address");
|
||||
res = 1;
|
||||
}
|
||||
if (strcmp (getvarinmod1 (), "vismod1.c") != 0)
|
||||
{
|
||||
puts ("`getvarinmod1' returns wrong value");
|
||||
res = 1;
|
||||
}
|
||||
if (strcmp (getvarinmod2 (), "vismod2.c") != 0)
|
||||
{
|
||||
puts ("`getvarinmod2' returns wrong value");
|
||||
res = 1;
|
||||
}
|
||||
|
||||
/* And a test where a variable definition is intercepted. */
|
||||
if (protvaritcpt == getvaritcpt1 ())
|
||||
{
|
||||
puts ("`protvaritcpt' in main and mod1 have same address");
|
||||
res = 1;
|
||||
}
|
||||
if (protvaritcpt == getvaritcpt2 ())
|
||||
{
|
||||
puts ("`protvaritcpt' in main and mod2 have same address");
|
||||
res = 1;
|
||||
}
|
||||
if (protvaritcpt != getvaritcpt3 ())
|
||||
{
|
||||
puts ("`protvaritcpt' in main and mod3 have not same address");
|
||||
res = 1;
|
||||
}
|
||||
if (getvaritcpt1 () == getvaritcpt2 ())
|
||||
{
|
||||
puts ("`protvaritcpt' in mod1 and mod2 have same address");
|
||||
res = 1;
|
||||
}
|
||||
if (strcmp (protvaritcpt, "vismod3.c") != 0)
|
||||
{
|
||||
puts ("`protvaritcpt in main has wrong value");
|
||||
res = 1;
|
||||
}
|
||||
if (strcmp (getvaritcpt1 (), "vismod1.c") != 0)
|
||||
{
|
||||
puts ("`getvaritcpt1' returns wrong value");
|
||||
res = 1;
|
||||
}
|
||||
if (strcmp (getvaritcpt2 (), "vismod2.c") != 0)
|
||||
{
|
||||
puts ("`getvaritcpt2' returns wrong value");
|
||||
res = 1;
|
||||
}
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
protlocal (void)
|
||||
{
|
||||
return 0x1;
|
||||
}
|
102
elf/vismod1.c
Normal file
102
elf/vismod1.c
Normal file
@ -0,0 +1,102 @@
|
||||
/* Copyright (C) 2000 Free Software Foundation, Inc.
|
||||
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
|
||||
published by the Free Software Foundation; either version 2 of the
|
||||
License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Library General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Library General Public
|
||||
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
||||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
int
|
||||
protlocal (void)
|
||||
{
|
||||
return 0x4;
|
||||
}
|
||||
asm (".protected protlocal");
|
||||
|
||||
|
||||
int
|
||||
calllocal1 (void)
|
||||
{
|
||||
return protlocal () + 0x10;
|
||||
}
|
||||
|
||||
int
|
||||
(*getlocal1 (void)) (void)
|
||||
{
|
||||
return protlocal;
|
||||
}
|
||||
|
||||
int
|
||||
protinmod (void)
|
||||
{
|
||||
return 0x400;
|
||||
}
|
||||
asm (".protected protinmod");
|
||||
|
||||
int
|
||||
callinmod1 (void)
|
||||
{
|
||||
return protinmod () + 0x1000;
|
||||
}
|
||||
|
||||
int
|
||||
(*getinmod1 (void)) (void)
|
||||
{
|
||||
return protinmod;
|
||||
}
|
||||
|
||||
int
|
||||
protitcpt (void)
|
||||
{
|
||||
return 0x40000;
|
||||
}
|
||||
asm (".protected protitcpt");
|
||||
|
||||
int
|
||||
callitcpt1 (void)
|
||||
{
|
||||
return protitcpt () + 0x100000;
|
||||
}
|
||||
|
||||
int
|
||||
(*getitcpt1 (void)) (void)
|
||||
{
|
||||
return protitcpt;
|
||||
}
|
||||
|
||||
const char *protvarlocal = __FILE__;
|
||||
asm (".protected protvarlocal");
|
||||
|
||||
const char *
|
||||
getvarlocal1 (void)
|
||||
{
|
||||
return protvarlocal;
|
||||
}
|
||||
|
||||
const char *protvarinmod = __FILE__;
|
||||
asm (".protected protvarinmod");
|
||||
|
||||
const char *
|
||||
getvarinmod1 (void)
|
||||
{
|
||||
return protvarinmod;
|
||||
}
|
||||
|
||||
const char *protvaritcpt = __FILE__;
|
||||
asm (".protected protvaritcpt");
|
||||
|
||||
const char *
|
||||
getvaritcpt1 (void)
|
||||
{
|
||||
return protvaritcpt;
|
||||
}
|
121
elf/vismod2.c
Normal file
121
elf/vismod2.c
Normal file
@ -0,0 +1,121 @@
|
||||
/* Copyright (C) 2000 Free Software Foundation, Inc.
|
||||
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
|
||||
published by the Free Software Foundation; either version 2 of the
|
||||
License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Library General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Library General Public
|
||||
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
||||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
int
|
||||
protlocal (void)
|
||||
{
|
||||
return 0x40;
|
||||
}
|
||||
asm (".protected protlocal");
|
||||
|
||||
|
||||
int
|
||||
calllocal2 (void)
|
||||
{
|
||||
return protlocal () + 0x100;
|
||||
}
|
||||
|
||||
int
|
||||
(*getlocal2 (void)) (void)
|
||||
{
|
||||
return protlocal;
|
||||
}
|
||||
|
||||
int
|
||||
protinmod (void)
|
||||
{
|
||||
return 0x4000;
|
||||
}
|
||||
asm (".protected protinmod");
|
||||
|
||||
int
|
||||
callinmod2 (void)
|
||||
{
|
||||
return protinmod () + 0x10000;
|
||||
}
|
||||
|
||||
int
|
||||
(*getinmod2 (void)) (void)
|
||||
{
|
||||
return protinmod;
|
||||
}
|
||||
|
||||
int
|
||||
protitcpt (void)
|
||||
{
|
||||
return 0x400000;
|
||||
}
|
||||
asm (".protected protitcpt");
|
||||
|
||||
int
|
||||
callitcpt2 (void)
|
||||
{
|
||||
return protitcpt () + 0x1000000;
|
||||
}
|
||||
|
||||
int
|
||||
(*getitcpt2 (void)) (void)
|
||||
{
|
||||
return protitcpt;
|
||||
}
|
||||
|
||||
const char *protvarlocal = __FILE__;
|
||||
asm (".protected protvarlocal");
|
||||
|
||||
const char *
|
||||
getvarlocal2 (void)
|
||||
{
|
||||
return protvarlocal;
|
||||
}
|
||||
|
||||
const char *protvarinmod = __FILE__;
|
||||
asm (".protected protvarinmod");
|
||||
|
||||
const char *
|
||||
getvarinmod2 (void)
|
||||
{
|
||||
return protvarinmod;
|
||||
}
|
||||
|
||||
const char *protvaritcpt = __FILE__;
|
||||
asm (".protected protvaritcpt");
|
||||
|
||||
const char *
|
||||
getvaritcpt2 (void)
|
||||
{
|
||||
return protvaritcpt;
|
||||
}
|
||||
|
||||
/* We must never call these functions. */
|
||||
int
|
||||
callitcpt3 (void)
|
||||
{
|
||||
abort ();
|
||||
}
|
||||
|
||||
int
|
||||
(*getitcpt3 (void)) (void)
|
||||
{
|
||||
abort ();
|
||||
}
|
||||
|
||||
const char *
|
||||
getvaritcpt3 (void)
|
||||
{
|
||||
abort ();
|
||||
}
|
45
elf/vismod3.c
Normal file
45
elf/vismod3.c
Normal file
@ -0,0 +1,45 @@
|
||||
/* Copyright (C) 2000 Free Software Foundation, Inc.
|
||||
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
|
||||
published by the Free Software Foundation; either version 2 of the
|
||||
License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Library General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Library General Public
|
||||
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
||||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
int
|
||||
protitcpt (void)
|
||||
{
|
||||
return 0x4000000;
|
||||
}
|
||||
asm (".protected protitcpt");
|
||||
|
||||
int
|
||||
callitcpt3 (void)
|
||||
{
|
||||
return protitcpt () + 0x10000000;
|
||||
}
|
||||
|
||||
int
|
||||
(*getitcpt3 (void)) (void)
|
||||
{
|
||||
return protitcpt;
|
||||
}
|
||||
|
||||
const char *protvaritcpt = __FILE__;
|
||||
asm (".protected protvaritcpt");
|
||||
|
||||
const char *
|
||||
getvaritcpt3 (void)
|
||||
{
|
||||
return protvaritcpt;
|
||||
}
|
Loading…
Reference in New Issue
Block a user