Changeset 280a27e in mainline for genarch


Ignore:
Timestamp:
2006-04-16T13:16:44Z (19 years ago)
Author:
Josef Cejka <malyzelenyhnus@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
50de918
Parents:
c624b96
Message:

Printf ported back from uspace to kernel.
Printf calls changed to match new conventions.

Location:
genarch
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • genarch/include/softint/division.h

    rc624b96 r280a27e  
    3535
    3636/* 64bit integer division */
    37 long __divdi3(long a, long b);
     37long long __divdi3(long long a, long long b);
    3838
    3939/* 32bit unsigned integer division */
    … …  
    4141
    4242/* 64bit unsigned integer division */
    43 unsigned long __udivdi3(unsigned long a, unsigned long b);
     43unsigned long long __udivdi3(unsigned long long a, unsigned long long b);
    4444
    4545/* 32bit remainder of the signed division */
    … …  
    4747
    4848/* 64bit remainder of the signed division */
    49 long __moddi3(long a, long b);
     49long long __moddi3(long long a, long long b);
    5050
    5151/* 32bit remainder of the unsigned division */
    … …  
    5353
    5454/* 64bit remainder of the unsigned division */
    55 unsigned long __umoddi3(unsigned long a, unsigned long b);
     55unsigned long long __umoddi3(unsigned long long a, unsigned long long b);
    5656
    57 unsigned long __udivmoddi3(unsigned long a, unsigned long b, unsigned long *c);
     57unsigned long long __udivmoddi3(unsigned long long a, unsigned long long b, unsigned long long *c);
    5858
    5959#endif

  • genarch/src/acpi/acpi.c

    rc624b96 r280a27e  
    9797                                        goto next;
    9898                                *signature_map[j].sdt_ptr = h;
    99                                 printf("%P: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
     99                                printf("%#zX: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
    100100                        }
    101101                }
    … …  
    118118                                        goto next;
    119119                                *signature_map[j].sdt_ptr = h;
    120                                 printf("%P: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
     120                                printf("%#zX: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
    121121                        }
    122122                }
    … …  
    152152
    153153rsdp_found:
    154         printf("%P: ACPI Root System Description Pointer\n", acpi_rsdp);
     154        printf("%#zX: ACPI Root System Description Pointer\n", acpi_rsdp);
    155155
    156156        acpi_rsdt = (struct acpi_rsdt *) (__native) acpi_rsdp->rsdt_address;

  • genarch/src/acpi/matd.c

    rc624b96 r280a27e  
    177177                        case MADT_L_SAPIC:
    178178                        case MADT_PLATFORM_INTR_SRC:
    179                                 printf("MADT: skipping %s entry (type=%d)\n", entry[h->type], h->type);
     179                                printf("MADT: skipping %s entry (type=%zd)\n", entry[h->type], h->type);
    180180                                break;
    181181
    182182                        default:
    183183                                if (h->type >= MADT_RESERVED_SKIP_BEGIN && h->type <= MADT_RESERVED_SKIP_END) {
    184                                         printf("MADT: skipping reserved entry (type=%d)\n", h->type);
     184                                        printf("MADT: skipping reserved entry (type=%zd)\n", h->type);
    185185                                }
    186186                                if (h->type >= MADT_RESERVED_OEM_BEGIN) {
    187                                         printf("MADT: skipping OEM entry (type=%d)\n", h->type);
     187                                        printf("MADT: skipping OEM entry (type=%zd)\n", h->type);
    188188                                }
    189189                                break;
    … …  
    229229{
    230230        ASSERT(override->source < sizeof(isa_irq_map)/sizeof(int));
    231         printf("MADT: ignoring %s entry: bus=%d, source=%d, global_int=%d, flags=%W\n",
     231        printf("MADT: ignoring %s entry: bus=%zd, source=%zd, global_int=%zd, flags=%#hX\n",
    232232                entry[override->header.type], override->bus, override->source,
    233233                override->global_int, override->flags);

  • genarch/src/i8042/i8042.c

    rc624b96 r280a27e  
    3333#include <arch/asm.h>
    3434#include <arch.h>
    35 #include <print.h>
    3635#include <synch/spinlock.h>
    3736#include <typedefs.h>

  • genarch/src/softint/division.c

    rc624b96 r280a27e  
    6666
    6767
    68 static unsigned long divandmod64(unsigned long a, unsigned long b, unsigned long *remainder)
     68static unsigned long long divandmod64(unsigned long long a, unsigned long long b, unsigned long long *remainder)
    6969{
    70         unsigned long result;
    71         int steps = sizeof(unsigned long) * 8;
     70        unsigned long long result;
     71        int steps = sizeof(unsigned long long) * 8;
    7272       
    7373        *remainder = 0;
    … …  
    112112
    113113/* 64bit integer division */
    114 long __divdi3(long a, long b)
     114long long __divdi3(long long a, long long b)
    115115{
    116         unsigned long rem;
    117         long result;
     116        unsigned long long rem;
     117        long long result;
    118118       
    119         result = (long)divandmod64(ABSVAL(a), ABSVAL(b), &rem);
     119        result = (long long)divandmod64(ABSVAL(a), ABSVAL(b), &rem);
    120120
    121121        if ( SGN(a) == SGN(b)) return result;
    … …  
    131131
    132132/* 64bit unsigned integer division */
    133 unsigned long __udivdi3(unsigned long a, unsigned long b)
     133unsigned long long __udivdi3(unsigned long long a, unsigned long long b)
    134134{
    135         unsigned long rem;
     135        unsigned long long  rem;
    136136        return divandmod64(a, b, &rem);
    137137}
    … …  
    152152
    153153/* 64bit remainder of the signed division */
    154 long __moddi3(long a, long b)
     154long long __moddi3(long long a,long long b)
    155155{
    156         unsigned long rem;
     156        unsigned long long rem;
    157157        divandmod64(a, b, &rem);
    158158       
    159159        /* if divident is negative, remainder must be too */
    160160        if (!(SGN(a))) {
    161                 return -((long)rem);
     161                return -((long long)rem);
    162162        }
    163163       
    164         return (long)rem;
     164        return (long long)rem;
    165165}
    166166
    … …  
    174174
    175175/* 64bit remainder of the unsigned division */
    176 unsigned long __umoddi3(unsigned long a, unsigned long b)
     176unsigned long long __umoddi3(unsigned long long a, unsigned long long b)
    177177{
    178         unsigned long rem;
     178        unsigned long long rem;
    179179        divandmod64(a, b, &rem);
    180180        return rem;
    181181}
    182182
    183 unsigned long __udivmoddi3(unsigned long a, unsigned long b, unsigned long *c)
     183unsigned long long __udivmoddi3(unsigned long long a, unsigned long long b, unsigned long long *c)
    184184{
    185185        return divandmod64(a, b, c);
Note: See TracChangeset for help on using the changeset viewer.