d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed the type of some ivar access functions. Ivars have type uintptr_t,

Browse Source 
not u_long.  On i386's with 64-bit longs, returning u_longs indirectly
in (more than) the space reserved for uintptr_t's tended to corrupt the
previous frame pointer in the stack frame, so it was not easy to debug.
The type mismatches are hidden by the bogus cast in DEVMETHOD().
This commit is contained in:
bde 2000-04-30 10:01:56 +00:00
parent c312c7291a
commit 8f35a08995
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/atkbdc/atkbdc_isa.c
View File

@ -62,9 +62,9 @@ static int atkbdc_probe(device_t dev);
static int atkbdc_attach(device_t dev);
static int atkbdc_print_child(device_t bus, device_t dev);
static int atkbdc_read_ivar(device_t bus, device_t dev, int index,
u_long *val);
uintptr_t *val);
static int atkbdc_write_ivar(device_t bus, device_t dev, int index,
u_long val);
uintptr_t val);
static device_method_t atkbdc_methods[] = {
DEVMETHOD(device_probe, atkbdc_probe),
@ -254,7 +254,7 @@ atkbdc_print_child(device_t bus, device_t dev)
}
static int
atkbdc_read_ivar(device_t bus, device_t dev, int index, u_long *val)
atkbdc_read_ivar(device_t bus, device_t dev, int index, uintptr_t *val)
{
atkbdc_device_t *ivar;
@ -285,7 +285,7 @@ atkbdc_read_ivar(device_t bus, device_t dev, int index, u_long *val)
}
static int
atkbdc_write_ivar(device_t bus, device_t dev, int index, u_long val)
atkbdc_write_ivar(device_t bus, device_t dev, int index, uintptr_t val)
{
atkbdc_device_t *ivar;

8
sys/dev/atkbdc/atkbdc_subr.c
View File

@ -62,9 +62,9 @@ static int atkbdc_probe(device_t dev);
static int atkbdc_attach(device_t dev);
static int atkbdc_print_child(device_t bus, device_t dev);
static int atkbdc_read_ivar(device_t bus, device_t dev, int index,
u_long *val);
uintptr_t *val);
static int atkbdc_write_ivar(device_t bus, device_t dev, int index,
u_long val);
uintptr_t val);
static device_method_t atkbdc_methods[] = {
DEVMETHOD(device_probe, atkbdc_probe),
@ -254,7 +254,7 @@ atkbdc_print_child(device_t bus, device_t dev)
}
static int
atkbdc_read_ivar(device_t bus, device_t dev, int index, u_long *val)
atkbdc_read_ivar(device_t bus, device_t dev, int index, uintptr_t *val)
{
atkbdc_device_t *ivar;
@ -285,7 +285,7 @@ atkbdc_read_ivar(device_t bus, device_t dev, int index, u_long *val)
}
static int
atkbdc_write_ivar(device_t bus, device_t dev, int index, u_long val)
atkbdc_write_ivar(device_t bus, device_t dev, int index, uintptr_t val)
{
atkbdc_device_t *ivar;

2
sys/dev/fdc/fdc.c
View File

@ -660,7 +660,7 @@ static struct isa_pnp_id fdc_ids[] = {
};
static int
fdc_read_ivar(device_t dev, device_t child, int which, u_long *result)
fdc_read_ivar(device_t dev, device_t child, int which, uintptr_t *result)
{
struct fdc_ivars *ivars = device_get_ivars(child);

2
sys/dev/pci/pci.c
View File

@ -1267,7 +1267,7 @@ pci_probe_nomatch(device_t dev, device_t child)
}
static int
pci_read_ivar(device_t dev, device_t child, int which, u_long *result)
pci_read_ivar(device_t dev, device_t child, int which, uintptr_t *result)
{
struct pci_devinfo *dinfo;
pcicfgregs *cfg;

8
sys/isa/atkbdc_isa.c
View File

@ -62,9 +62,9 @@ static int atkbdc_probe(device_t dev);
static int atkbdc_attach(device_t dev);
static int atkbdc_print_child(device_t bus, device_t dev);
static int atkbdc_read_ivar(device_t bus, device_t dev, int index,
u_long *val);
uintptr_t *val);
static int atkbdc_write_ivar(device_t bus, device_t dev, int index,
u_long val);
uintptr_t val);
static device_method_t atkbdc_methods[] = {
DEVMETHOD(device_probe, atkbdc_probe),
@ -254,7 +254,7 @@ atkbdc_print_child(device_t bus, device_t dev)
}
static int
atkbdc_read_ivar(device_t bus, device_t dev, int index, u_long *val)
atkbdc_read_ivar(device_t bus, device_t dev, int index, uintptr_t *val)
{
atkbdc_device_t *ivar;
@ -285,7 +285,7 @@ atkbdc_read_ivar(device_t bus, device_t dev, int index, u_long *val)
}
static int
atkbdc_write_ivar(device_t bus, device_t dev, int index, u_long val)
atkbdc_write_ivar(device_t bus, device_t dev, int index, uintptr_t val)
{
atkbdc_device_t *ivar;

2
sys/isa/fd.c
View File

@ -660,7 +660,7 @@ static struct isa_pnp_id fdc_ids[] = {
};
static int
fdc_read_ivar(device_t dev, device_t child, int which, u_long *result)
fdc_read_ivar(device_t dev, device_t child, int which, uintptr_t *result)
{
struct fdc_ivars *ivars = device_get_ivars(child);

2
sys/pci/pci.c
View File

@ -1267,7 +1267,7 @@ pci_probe_nomatch(device_t dev, device_t child)
}
static int
pci_read_ivar(device_t dev, device_t child, int which, u_long *result)
pci_read_ivar(device_t dev, device_t child, int which, uintptr_t *result)
{
struct pci_devinfo *dinfo;
pcicfgregs *cfg;

2
sys/pci/pcisupport.c
View File

@ -769,7 +769,7 @@ static int pcib_attach(device_t dev)
}
static int
pcib_read_ivar(device_t dev, device_t child, int which, u_long *result)
pcib_read_ivar(device_t dev, device_t child, int which, uintptr_t *result)
{
if (which == PCIB_IVAR_HOSE) {
/*