Commit a327a46e authored by David Mosberger's avatar David Mosberger

ia64: Minor fixes.

parent 0fd564c6
...@@ -376,7 +376,7 @@ extern unsigned long get_wchan (struct task_struct *p); ...@@ -376,7 +376,7 @@ extern unsigned long get_wchan (struct task_struct *p);
static inline unsigned long static inline unsigned long
ia64_get_kr (unsigned long regnum) ia64_get_kr (unsigned long regnum)
{ {
unsigned long r; unsigned long r = 0;
switch (regnum) { switch (regnum) {
case 0: asm volatile ("mov %0=ar.k0" : "=r"(r)); break; case 0: asm volatile ("mov %0=ar.k0" : "=r"(r)); break;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* Copyright (C) 1999 VA Linux Systems * Copyright (C) 1999 VA Linux Systems
* Copyright (C) 1999 Walt Drummond <drummond@valinux.com> * Copyright (C) 1999 Walt Drummond <drummond@valinux.com>
* Copyright (C) 2001-2002 Hewlett-Packard Co * Copyright (C) 2001-2003 Hewlett-Packard Co
* David Mosberger-Tang <davidm@hpl.hp.com> * David Mosberger-Tang <davidm@hpl.hp.com>
*/ */
#ifndef _ASM_IA64_SMP_H #ifndef _ASM_IA64_SMP_H
...@@ -74,7 +74,7 @@ cpu_logical_id (int cpuid) ...@@ -74,7 +74,7 @@ cpu_logical_id (int cpuid)
int i; int i;
for (i = 0; i < NR_CPUS; ++i) for (i = 0; i < NR_CPUS; ++i)
if (cpu_physical_id(i) == (__u32) cpuid) if (cpu_physical_id(i) == cpuid)
break; break;
return i; return i;
} }
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
* The main single-value unaligned transfer routines. Derived from * The main single-value unaligned transfer routines. Derived from
* the Linux/Alpha version. * the Linux/Alpha version.
* *
* Copyright (C) 1998, 1999 Hewlett-Packard Co * Copyright (C) 1998, 1999, 2003 Hewlett-Packard Co
* Copyright (C) 1998, 1999 David Mosberger-Tang <davidm@hpl.hp.com> * David Mosberger-Tang <davidm@hpl.hp.com>
*/ */
#define get_unaligned(ptr) \ #define get_unaligned(ptr) \
((__typeof__(*(ptr)))ia64_get_unaligned((ptr), sizeof(*(ptr)))) ((__typeof__(*(ptr)))ia64_get_unaligned((ptr), sizeof(*(ptr))))
...@@ -16,110 +16,105 @@ ...@@ -16,110 +16,105 @@
#define put_unaligned(x,ptr) \ #define put_unaligned(x,ptr) \
ia64_put_unaligned((unsigned long)(x), (ptr), sizeof(*(ptr))) ia64_put_unaligned((unsigned long)(x), (ptr), sizeof(*(ptr)))
/*
* EGCS 1.1 knows about arbitrary unaligned loads. Define some
* packed structures to talk about such things with.
*/
struct __una_u64 { __u64 x __attribute__((packed)); }; struct __una_u64 { __u64 x __attribute__((packed)); };
struct __una_u32 { __u32 x __attribute__((packed)); }; struct __una_u32 { __u32 x __attribute__((packed)); };
struct __una_u16 { __u16 x __attribute__((packed)); }; struct __una_u16 { __u16 x __attribute__((packed)); };
static inline unsigned long static inline unsigned long
__uldq (const unsigned long * r11) __uld8 (const unsigned long * addr)
{ {
const struct __una_u64 *ptr = (const struct __una_u64 *) r11; const struct __una_u64 *ptr = (const struct __una_u64 *) addr;
return ptr->x; return ptr->x;
} }
static inline unsigned long static inline unsigned long
__uldl (const unsigned int * r11) __uld4 (const unsigned int * addr)
{ {
const struct __una_u32 *ptr = (const struct __una_u32 *) r11; const struct __una_u32 *ptr = (const struct __una_u32 *) addr;
return ptr->x; return ptr->x;
} }
static inline unsigned long static inline unsigned long
__uldw (const unsigned short * r11) __uld2 (const unsigned short * addr)
{ {
const struct __una_u16 *ptr = (const struct __una_u16 *) r11; const struct __una_u16 *ptr = (const struct __una_u16 *) addr;
return ptr->x; return ptr->x;
} }
static inline void static inline void
__ustq (unsigned long r5, unsigned long * r11) __ust8 (unsigned long val, unsigned long * addr)
{ {
struct __una_u64 *ptr = (struct __una_u64 *) r11; struct __una_u64 *ptr = (struct __una_u64 *) addr;
ptr->x = r5; ptr->x = val;
} }
static inline void static inline void
__ustl (unsigned long r5, unsigned int * r11) __ust4 (unsigned long val, unsigned int * addr)
{ {
struct __una_u32 *ptr = (struct __una_u32 *) r11; struct __una_u32 *ptr = (struct __una_u32 *) addr;
ptr->x = r5; ptr->x = val;
} }
static inline void static inline void
__ustw (unsigned long r5, unsigned short * r11) __ust2 (unsigned long val, unsigned short * addr)
{ {
struct __una_u16 *ptr = (struct __una_u16 *) r11; struct __una_u16 *ptr = (struct __una_u16 *) addr;
ptr->x = r5; ptr->x = val;
} }
/* /*
* This function doesn't actually exist. The idea is that when * This function doesn't actually exist. The idea is that when someone uses the macros
* someone uses the macros below with an unsupported size (datatype), * below with an unsupported size (datatype), the linker will alert us to the problem via
* the linker will alert us to the problem via an unresolved reference * an unresolved reference error.
* error.
*/ */
extern unsigned long ia64_bad_unaligned_access_length (void); extern unsigned long ia64_bad_unaligned_access_length (void);
#define ia64_get_unaligned(_ptr,size) \ #define ia64_get_unaligned(_ptr,size) \
({ \ ({ \
const void *ptr = (_ptr); \ const void *__ia64_ptr = (_ptr); \
unsigned long val; \ unsigned long __ia64_val; \
\ \
switch (size) { \ switch (size) { \
case 1: \ case 1: \
val = *(const unsigned char *) ptr; \ __ia64_val = *(const unsigned char *) __ia64_ptr; \
break; \ break; \
case 2: \ case 2: \
val = __uldw((const unsigned short *)ptr); \ __ia64_val = __uld2((const unsigned short *)__ia64_ptr); \
break; \ break; \
case 4: \ case 4: \
val = __uldl((const unsigned int *)ptr); \ __ia64_val = __uld4((const unsigned int *)__ia64_ptr); \
break; \ break; \
case 8: \ case 8: \
val = __uldq((const unsigned long *)ptr); \ __ia64_val = __uld8((const unsigned long *)__ia64_ptr); \
break; \ break; \
default: \ default: \
val = ia64_bad_unaligned_access_length(); \ __ia64_val = ia64_bad_unaligned_access_length(); \
} \ } \
val; \ __ia64_val; \
}) })
#define ia64_put_unaligned(_val,_ptr,size) \ #define ia64_put_unaligned(_val,_ptr,size) \
do { \ do { \
const void *ptr = (_ptr); \ const void *__ia64_ptr = (_ptr); \
unsigned long val = (_val); \ unsigned long __ia64_val = (_val); \
\ \
switch (size) { \ switch (size) { \
case 1: \ case 1: \
*(unsigned char *)ptr = (val); \ *(unsigned char *)__ia64_ptr = (__ia64_val); \
break; \ break; \
case 2: \ case 2: \
__ustw(val, (unsigned short *)ptr); \ __ust2(__ia64_val, (unsigned short *)__ia64_ptr); \
break; \ break; \
case 4: \ case 4: \
__ustl(val, (unsigned int *)ptr); \ __ust4(__ia64_val, (unsigned int *)__ia64_ptr); \
break; \ break; \
case 8: \ case 8: \
__ustq(val, (unsigned long *)ptr); \ __ust8(__ia64_val, (unsigned long *)__ia64_ptr); \
break; \ break; \
default: \ default: \
ia64_bad_unaligned_access_length(); \ ia64_bad_unaligned_access_length(); \
} \ } \
} while (0) } while (0)
#endif /* _ASM_IA64_UNALIGNED_H */ #endif /* _ASM_IA64_UNALIGNED_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment