Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 1195 → Rev 1196

//kernel/trunk/genarch/include/softint/division.h
34,27 → 34,27
int __divsi3(int a, int b);
 
/* 64bit integer division */
long __divdi3(long a, long b);
long long __divdi3(long long a, long long b);
 
/* 32bit unsigned integer division */
unsigned int __udivsi3(unsigned int a, unsigned int b);
 
/* 64bit unsigned integer division */
unsigned long __udivdi3(unsigned long a, unsigned long b);
unsigned long long __udivdi3(unsigned long long a, unsigned long long b);
 
/* 32bit remainder of the signed division */
int __modsi3(int a, int b);
 
/* 64bit remainder of the signed division */
long __moddi3(long a, long b);
long long __moddi3(long long a, long long b);
 
/* 32bit remainder of the unsigned division */
unsigned int __umodsi3(unsigned int a, unsigned int b);
 
/* 64bit remainder of the unsigned division */
unsigned long __umoddi3(unsigned long a, unsigned long b);
unsigned long long __umoddi3(unsigned long long a, unsigned long long b);
 
unsigned long __udivmoddi3(unsigned long a, unsigned long b, unsigned long *c);
unsigned long long __udivmoddi3(unsigned long long a, unsigned long long b, unsigned long long *c);
 
#endif
 
//kernel/trunk/genarch/src/i8042/i8042.c
32,7 → 32,6
#include <cpu.h>
#include <arch/asm.h>
#include <arch.h>
#include <print.h>
#include <synch/spinlock.h>
#include <typedefs.h>
#include <console/chardev.h>
//kernel/trunk/genarch/src/softint/division.c
65,10 → 65,10
}
 
 
static unsigned long divandmod64(unsigned long a, unsigned long b, unsigned long *remainder)
static unsigned long long divandmod64(unsigned long long a, unsigned long long b, unsigned long long *remainder)
{
unsigned long result;
int steps = sizeof(unsigned long) * 8;
unsigned long long result;
int steps = sizeof(unsigned long long) * 8;
*remainder = 0;
result = 0;
111,12 → 111,12
}
 
/* 64bit integer division */
long __divdi3(long a, long b)
long long __divdi3(long long a, long long b)
{
unsigned long rem;
long result;
unsigned long long rem;
long long result;
result = (long)divandmod64(ABSVAL(a), ABSVAL(b), &rem);
result = (long long)divandmod64(ABSVAL(a), ABSVAL(b), &rem);
 
if ( SGN(a) == SGN(b)) return result;
return -result;
130,9 → 130,9
}
 
/* 64bit unsigned integer division */
unsigned long __udivdi3(unsigned long a, unsigned long b)
unsigned long long __udivdi3(unsigned long long a, unsigned long long b)
{
unsigned long rem;
unsigned long long rem;
return divandmod64(a, b, &rem);
}
 
151,17 → 151,17
}
 
/* 64bit remainder of the signed division */
long __moddi3(long a, long b)
long long __moddi3(long long a,long long b)
{
unsigned long rem;
unsigned long long rem;
divandmod64(a, b, &rem);
/* if divident is negative, remainder must be too */
if (!(SGN(a))) {
return -((long)rem);
return -((long long)rem);
}
return (long)rem;
return (long long)rem;
}
 
/* 32bit remainder of the unsigned division */
173,14 → 173,14
}
 
/* 64bit remainder of the unsigned division */
unsigned long __umoddi3(unsigned long a, unsigned long b)
unsigned long long __umoddi3(unsigned long long a, unsigned long long b)
{
unsigned long rem;
unsigned long long rem;
divandmod64(a, b, &rem);
return rem;
}
 
unsigned long __udivmoddi3(unsigned long a, unsigned long b, unsigned long *c)
unsigned long long __udivmoddi3(unsigned long long a, unsigned long long b, unsigned long long *c)
{
return divandmod64(a, b, c);
}
//kernel/trunk/genarch/src/acpi/matd.c
176,15 → 176,15
case MADT_IO_SAPIC:
case MADT_L_SAPIC:
case MADT_PLATFORM_INTR_SRC:
printf("MADT: skipping %s entry (type=%d)\n", entry[h->type], h->type);
printf("MADT: skipping %s entry (type=%zd)\n", entry[h->type], h->type);
break;
 
default:
if (h->type >= MADT_RESERVED_SKIP_BEGIN && h->type <= MADT_RESERVED_SKIP_END) {
printf("MADT: skipping reserved entry (type=%d)\n", h->type);
printf("MADT: skipping reserved entry (type=%zd)\n", h->type);
}
if (h->type >= MADT_RESERVED_OEM_BEGIN) {
printf("MADT: skipping OEM entry (type=%d)\n", h->type);
printf("MADT: skipping OEM entry (type=%zd)\n", h->type);
}
break;
}
228,7 → 228,7
void madt_intr_src_ovrd_entry(struct madt_intr_src_ovrd *override, __u32 index)
{
ASSERT(override->source < sizeof(isa_irq_map)/sizeof(int));
printf("MADT: ignoring %s entry: bus=%d, source=%d, global_int=%d, flags=%W\n",
printf("MADT: ignoring %s entry: bus=%zd, source=%zd, global_int=%zd, flags=%#hX\n",
entry[override->header.type], override->bus, override->source,
override->global_int, override->flags);
}
//kernel/trunk/genarch/src/acpi/acpi.c
96,7 → 96,7
if (!acpi_sdt_check((__u8 *) h))
goto next;
*signature_map[j].sdt_ptr = h;
printf("%P: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
printf("%#zX: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
}
}
next:
117,7 → 117,7
if (!acpi_sdt_check((__u8 *) h))
goto next;
*signature_map[j].sdt_ptr = h;
printf("%P: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
printf("%#zX: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
}
}
next:
151,7 → 151,7
return;
 
rsdp_found:
printf("%P: ACPI Root System Description Pointer\n", acpi_rsdp);
printf("%#zX: ACPI Root System Description Pointer\n", acpi_rsdp);
 
acpi_rsdt = (struct acpi_rsdt *) (__native) acpi_rsdp->rsdt_address;
if (acpi_rsdp->revision) acpi_xsdt = (struct acpi_xsdt *) ((__address) acpi_rsdp->xsdt_address);