From c54a108441190a39fde11037b3acb0afb5cc478c Mon Sep 17 00:00:00 2001 From: Miod Vallat Date: Sun, 4 Apr 2010 12:50:01 +0000 Subject: regen --- sys/arch/sparc64/sparc64/busop.c | 150 +++++++-------------------------------- sys/arch/sparc64/sparc64/busop.h | 22 ++---- 2 files changed, 30 insertions(+), 142 deletions(-) diff --git a/sys/arch/sparc64/sparc64/busop.c b/sys/arch/sparc64/sparc64/busop.c index e52d82ada97..bd0e500dc23 100644 --- a/sys/arch/sparc64/sparc64/busop.c +++ b/sys/arch/sparc64/sparc64/busop.c @@ -2,7 +2,7 @@ * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. */ -/* $OpenBSD: busop.c,v 1.1 2003/02/17 01:29:20 henric Exp $ */ +/* $OpenBSD: busop.c,v 1.2 2010/04/04 12:50:00 miod Exp $ */ /* * Copyright (c) 2003 Henric Jungheim @@ -53,7 +53,7 @@ bus_space_read_multi_2(bus_space_tag_t t, bus_space_handle_t h, BUS_SPACE_TRACE(t, h, ("bsrm2(%llx + %llx, %x, %x) ->", (long long)h.bh_ptr, (long long)o, t->asi, c)); - + ++c; /* Looping on "--c" is slightly faster than on "c--" */ asi_set(t->asi); while (--c > 0) { @@ -61,7 +61,7 @@ bus_space_read_multi_2(bus_space_tag_t t, bus_space_handle_t h, BUS_SPACE_TRACE(t, h, (" %4.4x", r)); *p++ = r; } - + BUS_SPACE_TRACE(t, h, ("\n")); } @@ -168,7 +168,7 @@ bus_space_set_region_2(bus_space_tag_t t, bus_space_handle_t h, } void -bus_space_copy_region_2(bus_space_tag_t t, bus_space_handle_t h1, +bus_space_copy_2(bus_space_tag_t t, bus_space_handle_t h1, bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c) { @@ -184,7 +184,7 @@ bus_space_copy_region_2(bus_space_tag_t t, bus_space_handle_t h1, t->asi, c)); asi_set(t->asi); - for (; c; c--, ptr1 += 2, ptr2 += 2) { + for (; c; c--, ptr1 += 2, ptr2 += 2) { u_int16_t r = lduha_asi(ptr2); BUS_SPACE_TRACE(t, h1, (" %4.4x", r)); stha_asi(ptr1, r); @@ -209,7 +209,7 @@ bus_space_read_multi_4(bus_space_tag_t t, bus_space_handle_t h, BUS_SPACE_TRACE(t, h, ("bsrm4(%llx + %llx, %x, %x) ->", (long long)h.bh_ptr, (long long)o, t->asi, c)); - + ++c; /* Looping on "--c" is slightly faster than on "c--" */ asi_set(t->asi); while (--c > 0) { @@ -217,7 +217,7 @@ bus_space_read_multi_4(bus_space_tag_t t, bus_space_handle_t h, BUS_SPACE_TRACE(t, h, (" %8.8x", r)); *p++ = r; } - + BUS_SPACE_TRACE(t, h, ("\n")); } @@ -324,7 +324,7 @@ bus_space_set_region_4(bus_space_tag_t t, bus_space_handle_t h, } void -bus_space_copy_region_4(bus_space_tag_t t, bus_space_handle_t h1, +bus_space_copy_4(bus_space_tag_t t, bus_space_handle_t h1, bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c) { @@ -340,7 +340,7 @@ bus_space_copy_region_4(bus_space_tag_t t, bus_space_handle_t h1, t->asi, c)); asi_set(t->asi); - for (; c; c--, ptr1 += 4, ptr2 += 4) { + for (; c; c--, ptr1 += 4, ptr2 += 4) { u_int32_t r = lduwa_asi(ptr2); BUS_SPACE_TRACE(t, h1, (" %8.8x", r)); stwa_asi(ptr1, r); @@ -365,7 +365,7 @@ bus_space_read_multi_8(bus_space_tag_t t, bus_space_handle_t h, BUS_SPACE_TRACE(t, h, ("bsrm8(%llx + %llx, %x, %x) ->", (long long)h.bh_ptr, (long long)o, t->asi, c)); - + ++c; /* Looping on "--c" is slightly faster than on "c--" */ asi_set(t->asi); while (--c > 0) { @@ -373,7 +373,7 @@ bus_space_read_multi_8(bus_space_tag_t t, bus_space_handle_t h, BUS_SPACE_TRACE(t, h, (" %16.16llx", r)); *p++ = r; } - + BUS_SPACE_TRACE(t, h, ("\n")); } @@ -480,7 +480,7 @@ bus_space_set_region_8(bus_space_tag_t t, bus_space_handle_t h, } void -bus_space_copy_region_8(bus_space_tag_t t, bus_space_handle_t h1, +bus_space_copy_8(bus_space_tag_t t, bus_space_handle_t h1, bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c) { @@ -496,7 +496,7 @@ bus_space_copy_region_8(bus_space_tag_t t, bus_space_handle_t h1, t->asi, c)); asi_set(t->asi); - for (; c; c--, ptr1 += 8, ptr2 += 8) { + for (; c; c--, ptr1 += 8, ptr2 += 8) { u_int64_t r = ldxa_asi(ptr2); BUS_SPACE_TRACE(t, h1, (" %16.16llx", r)); stxa_asi(ptr1, r); @@ -521,7 +521,7 @@ bus_space_read_multi_1(bus_space_tag_t t, bus_space_handle_t h, BUS_SPACE_TRACE(t, h, ("bsrm1(%llx + %llx, %x, %x) ->", (long long)h.bh_ptr, (long long)o, t->asi, c)); - + ++c; /* Looping on "--c" is slightly faster than on "c--" */ asi_set(t->asi); while (--c > 0) { @@ -529,7 +529,7 @@ bus_space_read_multi_1(bus_space_tag_t t, bus_space_handle_t h, BUS_SPACE_TRACE(t, h, (" %2.2x", r)); *p++ = r; } - + BUS_SPACE_TRACE(t, h, ("\n")); } @@ -636,7 +636,7 @@ bus_space_set_region_1(bus_space_tag_t t, bus_space_handle_t h, } void -bus_space_copy_region_1(bus_space_tag_t t, bus_space_handle_t h1, +bus_space_copy_1(bus_space_tag_t t, bus_space_handle_t h1, bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c) { @@ -652,7 +652,7 @@ bus_space_copy_region_1(bus_space_tag_t t, bus_space_handle_t h1, t->asi, c)); asi_set(t->asi); - for (; c; c--, ptr1 += 1, ptr2 += 1) { + for (; c; c--, ptr1 += 1, ptr2 += 1) { u_int8_t r = lduba_asi(ptr2); BUS_SPACE_TRACE(t, h1, (" %2.2x", r)); stba_asi(ptr1, r); @@ -678,7 +678,7 @@ bus_space_read_raw_multi_2(bus_space_tag_t t, bus_space_handle_t h, ("bsrm2(%llx + %llx, %x, %x) ->", (long long)h.bh_ptr, (long long)o, t->sasi, c)); c /= sizeof(u_int16_t); - + ++c; /* Looping on "--c" is slightly faster than on "c--" */ asi_set(t->sasi); while (--c > 0) { @@ -686,7 +686,7 @@ bus_space_read_raw_multi_2(bus_space_tag_t t, bus_space_handle_t h, BUS_SPACE_TRACE(t, h, (" %4.4x", r)); *p++ = r; } - + BUS_SPACE_TRACE(t, h, ("\n")); } @@ -797,31 +797,6 @@ bus_space_set_raw_region_2(bus_space_tag_t t, bus_space_handle_t h, stha_asi(ptr, v); } -void -bus_space_copy_raw_region_2(bus_space_tag_t t, bus_space_handle_t h1, - bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, - size_t c) -{ - paddr_t ptr1 = h1.bh_ptr + o1; - paddr_t ptr2 = h2.bh_ptr + o2; - - BUS_SPACE_ASSERT(t, h1, o2, 2); - BUS_SPACE_ASSERT(t, h2, o2, 2); - BUS_SPACE_TRACE(t, h1, - ("bscr2(%llx + %llx, %llx + %llx, %x, %x) <-> \n", - (long long)h1.bh_ptr, (long long)o1, - (long long)h2.bh_ptr, (long long)o2, - t->sasi, c)); - c /= sizeof(u_int16_t); - - asi_set(t->sasi); - for (; c; c--, ptr1 += 2, ptr2 += 2) { - u_int16_t r = lduha_asi(ptr2); - BUS_SPACE_TRACE(t, h1, (" %4.4x", r)); - stha_asi(ptr1, r); - } - BUS_SPACE_TRACE(t, h1, ("\n")); -} /* @@ -841,7 +816,7 @@ bus_space_read_raw_multi_4(bus_space_tag_t t, bus_space_handle_t h, ("bsrm4(%llx + %llx, %x, %x) ->", (long long)h.bh_ptr, (long long)o, t->sasi, c)); c /= sizeof(u_int32_t); - + ++c; /* Looping on "--c" is slightly faster than on "c--" */ asi_set(t->sasi); while (--c > 0) { @@ -849,7 +824,7 @@ bus_space_read_raw_multi_4(bus_space_tag_t t, bus_space_handle_t h, BUS_SPACE_TRACE(t, h, (" %8.8x", r)); *p++ = r; } - + BUS_SPACE_TRACE(t, h, ("\n")); } @@ -960,31 +935,6 @@ bus_space_set_raw_region_4(bus_space_tag_t t, bus_space_handle_t h, stwa_asi(ptr, v); } -void -bus_space_copy_raw_region_4(bus_space_tag_t t, bus_space_handle_t h1, - bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, - size_t c) -{ - paddr_t ptr1 = h1.bh_ptr + o1; - paddr_t ptr2 = h2.bh_ptr + o2; - - BUS_SPACE_ASSERT(t, h1, o2, 4); - BUS_SPACE_ASSERT(t, h2, o2, 4); - BUS_SPACE_TRACE(t, h1, - ("bscr4(%llx + %llx, %llx + %llx, %x, %x) <-> \n", - (long long)h1.bh_ptr, (long long)o1, - (long long)h2.bh_ptr, (long long)o2, - t->sasi, c)); - c /= sizeof(u_int32_t); - - asi_set(t->sasi); - for (; c; c--, ptr1 += 4, ptr2 += 4) { - u_int32_t r = lduwa_asi(ptr2); - BUS_SPACE_TRACE(t, h1, (" %8.8x", r)); - stwa_asi(ptr1, r); - } - BUS_SPACE_TRACE(t, h1, ("\n")); -} /* @@ -1004,7 +954,7 @@ bus_space_read_raw_multi_8(bus_space_tag_t t, bus_space_handle_t h, ("bsrm8(%llx + %llx, %x, %x) ->", (long long)h.bh_ptr, (long long)o, t->sasi, c)); c /= sizeof(u_int64_t); - + ++c; /* Looping on "--c" is slightly faster than on "c--" */ asi_set(t->sasi); while (--c > 0) { @@ -1012,7 +962,7 @@ bus_space_read_raw_multi_8(bus_space_tag_t t, bus_space_handle_t h, BUS_SPACE_TRACE(t, h, (" %16.16llx", r)); *p++ = r; } - + BUS_SPACE_TRACE(t, h, ("\n")); } @@ -1123,31 +1073,6 @@ bus_space_set_raw_region_8(bus_space_tag_t t, bus_space_handle_t h, stxa_asi(ptr, v); } -void -bus_space_copy_raw_region_8(bus_space_tag_t t, bus_space_handle_t h1, - bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, - size_t c) -{ - paddr_t ptr1 = h1.bh_ptr + o1; - paddr_t ptr2 = h2.bh_ptr + o2; - - BUS_SPACE_ASSERT(t, h1, o2, 8); - BUS_SPACE_ASSERT(t, h2, o2, 8); - BUS_SPACE_TRACE(t, h1, - ("bscr8(%llx + %llx, %llx + %llx, %x, %x) <-> \n", - (long long)h1.bh_ptr, (long long)o1, - (long long)h2.bh_ptr, (long long)o2, - t->sasi, c)); - c /= sizeof(u_int64_t); - - asi_set(t->sasi); - for (; c; c--, ptr1 += 8, ptr2 += 8) { - u_int64_t r = ldxa_asi(ptr2); - BUS_SPACE_TRACE(t, h1, (" %16.16llx", r)); - stxa_asi(ptr1, r); - } - BUS_SPACE_TRACE(t, h1, ("\n")); -} /* @@ -1167,7 +1092,7 @@ bus_space_read_raw_multi_1(bus_space_tag_t t, bus_space_handle_t h, ("bsrm1(%llx + %llx, %x, %x) ->", (long long)h.bh_ptr, (long long)o, t->sasi, c)); c /= sizeof(u_int8_t); - + ++c; /* Looping on "--c" is slightly faster than on "c--" */ asi_set(t->sasi); while (--c > 0) { @@ -1175,7 +1100,7 @@ bus_space_read_raw_multi_1(bus_space_tag_t t, bus_space_handle_t h, BUS_SPACE_TRACE(t, h, (" %2.2x", r)); *p++ = r; } - + BUS_SPACE_TRACE(t, h, ("\n")); } @@ -1286,30 +1211,5 @@ bus_space_set_raw_region_1(bus_space_tag_t t, bus_space_handle_t h, stba_asi(ptr, v); } -void -bus_space_copy_raw_region_1(bus_space_tag_t t, bus_space_handle_t h1, - bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, - size_t c) -{ - paddr_t ptr1 = h1.bh_ptr + o1; - paddr_t ptr2 = h2.bh_ptr + o2; - - BUS_SPACE_ASSERT(t, h1, o2, 1); - BUS_SPACE_ASSERT(t, h2, o2, 1); - BUS_SPACE_TRACE(t, h1, - ("bscr1(%llx + %llx, %llx + %llx, %x, %x) <-> \n", - (long long)h1.bh_ptr, (long long)o1, - (long long)h2.bh_ptr, (long long)o2, - t->sasi, c)); - c /= sizeof(u_int8_t); - - asi_set(t->sasi); - for (; c; c--, ptr1 += 1, ptr2 += 1) { - u_int8_t r = lduba_asi(ptr2); - BUS_SPACE_TRACE(t, h1, (" %2.2x", r)); - stba_asi(ptr1, r); - } - BUS_SPACE_TRACE(t, h1, ("\n")); -} diff --git a/sys/arch/sparc64/sparc64/busop.h b/sys/arch/sparc64/sparc64/busop.h index b4fb2e38d07..242b32aed96 100644 --- a/sys/arch/sparc64/sparc64/busop.h +++ b/sys/arch/sparc64/sparc64/busop.h @@ -2,7 +2,7 @@ * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. */ -/* $OpenBSD: busop.h,v 1.1 2003/02/17 01:29:20 henric Exp $ */ +/* $OpenBSD: busop.h,v 1.2 2010/04/04 12:50:00 miod Exp $ */ /* * Copyright (c) 2003 Henric Jungheim @@ -58,7 +58,7 @@ void bus_space_write_region_2(bus_space_tag_t, bus_space_handle_t, void bus_space_set_region_2(bus_space_tag_t, bus_space_handle_t, bus_size_t, u_int16_t, bus_size_t); -void bus_space_copy_region_2(bus_space_tag_t, bus_space_handle_t, +void bus_space_copy_2(bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t); @@ -121,7 +121,7 @@ void bus_space_write_region_4(bus_space_tag_t, bus_space_handle_t, void bus_space_set_region_4(bus_space_tag_t, bus_space_handle_t, bus_size_t, u_int32_t, bus_size_t); -void bus_space_copy_region_4(bus_space_tag_t, bus_space_handle_t, +void bus_space_copy_4(bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t); @@ -184,7 +184,7 @@ void bus_space_write_region_8(bus_space_tag_t, bus_space_handle_t, void bus_space_set_region_8(bus_space_tag_t, bus_space_handle_t, bus_size_t, u_int64_t, bus_size_t); -void bus_space_copy_region_8(bus_space_tag_t, bus_space_handle_t, +void bus_space_copy_8(bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t); @@ -247,7 +247,7 @@ void bus_space_write_region_1(bus_space_tag_t, bus_space_handle_t, void bus_space_set_region_1(bus_space_tag_t, bus_space_handle_t, bus_size_t, u_int8_t, bus_size_t); -void bus_space_copy_region_1(bus_space_tag_t, bus_space_handle_t, +void bus_space_copy_1(bus_space_tag_t, bus_space_handle_t, bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t); @@ -310,9 +310,6 @@ void bus_space_write_raw_region_2(bus_space_tag_t, bus_space_handle_t, void bus_space_set_raw_region_2(bus_space_tag_t, bus_space_handle_t, bus_size_t, u_int16_t, size_t); -void bus_space_copy_raw_region_2(bus_space_tag_t, bus_space_handle_t, - bus_size_t, bus_space_handle_t, bus_size_t, - size_t); static inline u_int16_t bus_space_read_raw_2(bus_space_tag_t t, bus_space_handle_t h, @@ -373,9 +370,6 @@ void bus_space_write_raw_region_4(bus_space_tag_t, bus_space_handle_t, void bus_space_set_raw_region_4(bus_space_tag_t, bus_space_handle_t, bus_size_t, u_int32_t, size_t); -void bus_space_copy_raw_region_4(bus_space_tag_t, bus_space_handle_t, - bus_size_t, bus_space_handle_t, bus_size_t, - size_t); static inline u_int32_t bus_space_read_raw_4(bus_space_tag_t t, bus_space_handle_t h, @@ -436,9 +430,6 @@ void bus_space_write_raw_region_8(bus_space_tag_t, bus_space_handle_t, void bus_space_set_raw_region_8(bus_space_tag_t, bus_space_handle_t, bus_size_t, u_int64_t, size_t); -void bus_space_copy_raw_region_8(bus_space_tag_t, bus_space_handle_t, - bus_size_t, bus_space_handle_t, bus_size_t, - size_t); static inline u_int64_t bus_space_read_raw_8(bus_space_tag_t t, bus_space_handle_t h, @@ -499,9 +490,6 @@ void bus_space_write_raw_region_1(bus_space_tag_t, bus_space_handle_t, void bus_space_set_raw_region_1(bus_space_tag_t, bus_space_handle_t, bus_size_t, u_int8_t, size_t); -void bus_space_copy_raw_region_1(bus_space_tag_t, bus_space_handle_t, - bus_size_t, bus_space_handle_t, bus_size_t, - size_t); static inline u_int8_t bus_space_read_raw_1(bus_space_tag_t t, bus_space_handle_t h, -- cgit v1.2.3