| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | /* $NetBSD: types.h,v 1.24 2013/05/07 23:01:55 matt Exp $ */ | | 1 | /* $NetBSD: types.h,v 1.25 2013/07/02 05:57:00 matt Exp $ */ |
2 | | | 2 | |
3 | /* | | 3 | /* |
4 | * Copyright (c) 1990 The Regents of the University of California. | | 4 | * Copyright (c) 1990 The Regents of the University of California. |
5 | * All rights reserved. | | 5 | * All rights reserved. |
6 | * | | 6 | * |
7 | * Redistribution and use in source and binary forms, with or without | | 7 | * Redistribution and use in source and binary forms, with or without |
8 | * modification, are permitted provided that the following conditions | | 8 | * modification, are permitted provided that the following conditions |
9 | * are met: | | 9 | * are met: |
10 | * 1. Redistributions of source code must retain the above copyright | | 10 | * 1. Redistributions of source code must retain the above copyright |
11 | * notice, this list of conditions and the following disclaimer. | | 11 | * notice, this list of conditions and the following disclaimer. |
12 | * 2. Redistributions in binary form must reproduce the above copyright | | 12 | * 2. Redistributions in binary form must reproduce the above copyright |
13 | * notice, this list of conditions and the following disclaimer in the | | 13 | * notice, this list of conditions and the following disclaimer in the |
14 | * documentation and/or other materials provided with the distribution. | | 14 | * documentation and/or other materials provided with the distribution. |
| @@ -57,26 +57,27 @@ typedef unsigned long vsize_t; | | | @@ -57,26 +57,27 @@ typedef unsigned long vsize_t; |
57 | #define PRIxPSIZE "lx" | | 57 | #define PRIxPSIZE "lx" |
58 | #define PRIuPSIZE "lu" | | 58 | #define PRIuPSIZE "lu" |
59 | #define PRIxVADDR "lx" | | 59 | #define PRIxVADDR "lx" |
60 | #define PRIxVSIZE "lx" | | 60 | #define PRIxVSIZE "lx" |
61 | #define PRIuVSIZE "lu" | | 61 | #define PRIuVSIZE "lu" |
62 | #endif | | 62 | #endif |
63 | | | 63 | |
64 | typedef int register_t, register32_t; | | 64 | typedef int register_t, register32_t; |
65 | #define PRIxREGISTER "x" | | 65 | #define PRIxREGISTER "x" |
66 | | | 66 | |
67 | typedef unsigned long pmc_evid_t; | | 67 | typedef unsigned long pmc_evid_t; |
68 | #define PMC_INVALID_EVID (-1) | | 68 | #define PMC_INVALID_EVID (-1) |
69 | typedef unsigned long pmc_ctr_t; | | 69 | typedef unsigned long pmc_ctr_t; |
| | | 70 | typedef unsigned short tlb_asid_t; |
70 | | | 71 | |
71 | /* | | 72 | /* |
72 | * This should have always been an 8-bit type, but since it's been exposed | | 73 | * This should have always been an 8-bit type, but since it's been exposed |
73 | * to user-space, we don't want ABI breakage there. | | 74 | * to user-space, we don't want ABI breakage there. |
74 | */ | | 75 | */ |
75 | #if defined(_KERNEL) | | 76 | #if defined(_KERNEL) |
76 | typedef volatile unsigned char __cpu_simple_lock_t; | | 77 | typedef volatile unsigned char __cpu_simple_lock_t; |
77 | #else | | 78 | #else |
78 | typedef volatile int __cpu_simple_lock_t; | | 79 | typedef volatile int __cpu_simple_lock_t; |
79 | #endif /* _KERNEL */ | | 80 | #endif /* _KERNEL */ |
80 | | | 81 | |
81 | #define __SIMPLELOCK_LOCKED 1 | | 82 | #define __SIMPLELOCK_LOCKED 1 |
82 | #define __SIMPLELOCK_UNLOCKED 0 | | 83 | #define __SIMPLELOCK_UNLOCKED 0 |