[arm] Split out 32-bit-specific code to arch/arm32

Signed-off-by: Michael Brown <mcb30@ipxe.org>

7 files changed, 0 insertions, 622 deletions

diff --git a/src/arch/arm/include/bits/bigint.h b/src/arch/arm/include/bits/bigint.h
deleted file mode 100644
index 103c6c489..000000000
--- a/src/arch/arm/include/bits/bigint.h
+++ /dev/null
@@ -1,316 +0,0 @@
-#ifndef _BITS_BIGINT_H
-#define _BITS_BIGINT_H
-
-/** @file
- *
- * Big integer support
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#include <stdint.h>
-#include <string.h>
-#include <strings.h>
-
-/** Element of a big integer */
-typedef uint32_t bigint_element_t;
-
-/**
- * Initialise big integer
- *
- * @v value0		Element 0 of big integer to initialise
- * @v size		Number of elements
- * @v data		Raw data
- * @v len		Length of raw data
- */
-static inline __attribute__ (( always_inline )) void
-bigint_init_raw ( uint32_t *value0, unsigned int size,
-		  const void *data, size_t len ) {
-	size_t pad_len = ( sizeof ( bigint_t ( size ) ) - len );
-	uint8_t *value_byte = ( ( void * ) value0 );
-	const uint8_t *data_byte = ( data + len );
-
-	/* Copy raw data in reverse order, padding with zeros */
-	while ( len-- )
-		*(value_byte++) = *(--data_byte);
-	while ( pad_len-- )
-		*(value_byte++) = 0;
-}
-
-/**
- * Add big integers
- *
- * @v addend0		Element 0 of big integer to add
- * @v value0		Element 0 of big integer to be added to
- * @v size		Number of elements
- */
-static inline __attribute__ (( always_inline )) void
-bigint_add_raw ( const uint32_t *addend0, uint32_t *value0,
-		 unsigned int size ) {
-	bigint_t ( size ) __attribute__ (( may_alias )) *value =
-		( ( void * ) value0 );
-	uint32_t *discard_addend;
-	uint32_t *discard_value;
-	uint32_t *discard_end;
-	uint32_t discard_addend_i;
-	uint32_t discard_value_i;
-
-	__asm__ __volatile__ ( "adds %2, %0, %8, lsl #2\n\t" /* clear CF */
-			       "\n1:\n\t"
-			       "ldmia %0!, {%3}\n\t"
-			       "ldr %4, [%1]\n\t"
-			       "adcs %4, %3\n\t"
-			       "stmia %1!, {%4}\n\t"
-			       "teq %0, %2\n\t"
-			       "bne 1b\n\t"
-			       : "=l" ( discard_addend ),
-				 "=l" ( discard_value ),
-				 "=l" ( discard_end ),
-				 "=l" ( discard_addend_i ),
-				 "=l" ( discard_value_i ),
-				 "+m" ( *value )
-			       : "0" ( addend0 ), "1" ( value0 ), "l" ( size )
-			       : "cc" );
-}
-
-/**
- * Subtract big integers
- *
- * @v subtrahend0	Element 0 of big integer to subtract
- * @v value0		Element 0 of big integer to be subtracted from
- * @v size		Number of elements
- */
-static inline __attribute__ (( always_inline )) void
-bigint_subtract_raw ( const uint32_t *subtrahend0, uint32_t *value0,
-		      unsigned int size ) {
-	bigint_t ( size ) __attribute__ (( may_alias )) *value =
-		( ( void * ) value0 );
-	uint32_t *discard_subtrahend;
-	uint32_t *discard_value;
-	uint32_t *discard_end;
-	uint32_t discard_subtrahend_i;
-	uint32_t discard_value_i;
-
-	__asm__ __volatile__ ( "add %2, %0, %8, lsl #2\n\t"
-			       "cmp %2, %0\n\t" /* set CF */
-			       "\n1:\n\t"
-			       "ldmia %0!, {%3}\n\t"
-			       "ldr %4, [%1]\n\t"
-			       "sbcs %4, %3\n\t"
-			       "stmia %1!, {%4}\n\t"
-			       "teq %0, %2\n\t"
-			       "bne 1b\n\t"
-			       : "=l" ( discard_subtrahend ),
-				 "=l" ( discard_value ),
-				 "=l" ( discard_end ),
-				 "=l" ( discard_subtrahend_i ),
-				 "=l" ( discard_value_i ),
-				 "+m" ( *value )
-			       : "0" ( subtrahend0 ), "1" ( value0 ),
-				 "l" ( size )
-			       : "cc" );
-}
-
-/**
- * Rotate big integer left
- *
- * @v value0		Element 0 of big integer
- * @v size		Number of elements
- */
-static inline __attribute__ (( always_inline )) void
-bigint_rol_raw ( uint32_t *value0, unsigned int size ) {
-	bigint_t ( size ) __attribute__ (( may_alias )) *value =
-		( ( void * ) value0 );
-	uint32_t *discard_value;
-	uint32_t *discard_end;
-	uint32_t discard_value_i;
-
-	__asm__ __volatile__ ( "adds %1, %0, %5, lsl #2\n\t" /* clear CF */
-			       "\n1:\n\t"
-			       "ldr %2, [%0]\n\t"
-			       "adcs %2, %2\n\t"
-			       "stmia %0!, {%2}\n\t"
-			       "teq %0, %1\n\t"
-			       "bne 1b\n\t"
-			       : "=l" ( discard_value ),
-				 "=l" ( discard_end ),
-				 "=l" ( discard_value_i ),
-				 "+m" ( *value )
-			       : "0" ( value0 ), "1" ( size )
-			       : "cc" );
-}
-
-/**
- * Rotate big integer right
- *
- * @v value0		Element 0 of big integer
- * @v size		Number of elements
- */
-static inline __attribute__ (( always_inline )) void
-bigint_ror_raw ( uint32_t *value0, unsigned int size ) {
-	bigint_t ( size ) __attribute__ (( may_alias )) *value =
-		( ( void * ) value0 );
-	uint32_t *discard_value;
-	uint32_t *discard_end;
-	uint32_t discard_value_i;
-
-	__asm__ __volatile__ ( "adds %1, %0, %5, lsl #2\n\t" /* clear CF */
-			       "\n1:\n\t"
-			       "ldmdb %1!, {%2}\n\t"
-			       "rrxs %2, %2\n\t"
-			       "str %2, [%1]\n\t"
-			       "teq %0, %1\n\t"
-			       "bne 1b\n\t"
-			       : "=l" ( discard_value ),
-				 "=l" ( discard_end ),
-				 "=l" ( discard_value_i ),
-				 "+m" ( *value )
-			       : "0" ( value0 ), "1" ( size )
-			       : "cc" );
-}
-
-/**
- * Test if big integer is equal to zero
- *
- * @v value0		Element 0 of big integer
- * @v size		Number of elements
- * @ret is_zero		Big integer is equal to zero
- */
-static inline __attribute__ (( always_inline, pure )) int
-bigint_is_zero_raw ( const uint32_t *value0, unsigned int size ) {
-	const uint32_t *value = value0;
-	uint32_t value_i;
-
-	do {
-		value_i = *(value++);
-		if ( value_i )
-			break;
-	} while ( --size );
-
-	return ( value_i == 0 );
-}
-
-/**
- * Compare big integers
- *
- * @v value0		Element 0 of big integer
- * @v reference0	Element 0 of reference big integer
- * @v size		Number of elements
- * @ret geq		Big integer is greater than or equal to the reference
- */
-static inline __attribute__ (( always_inline, pure )) int
-bigint_is_geq_raw ( const uint32_t *value0, const uint32_t *reference0,
-		    unsigned int size ) {
-	const uint32_t *value = ( value0 + size );
-	const uint32_t *reference = ( reference0 + size );
-	uint32_t value_i;
-	uint32_t reference_i;
-
-	do {
-		value_i = *(--value);
-		reference_i = *(--reference);
-		if ( value_i != reference_i )
-			break;
-	} while ( --size );
-
-	return ( value_i >= reference_i );
-}
-
-/**
- * Test if bit is set in big integer
- *
- * @v value0		Element 0 of big integer
- * @v size		Number of elements
- * @v bit		Bit to test
- * @ret is_set		Bit is set
- */
-static inline __attribute__ (( always_inline )) int
-bigint_bit_is_set_raw ( const uint32_t *value0, unsigned int size,
-			unsigned int bit ) {
-	const bigint_t ( size ) __attribute__ (( may_alias )) *value =
-		( ( const void * ) value0 );
-	unsigned int index = ( bit / ( 8 * sizeof ( value->element[0] ) ) );
-	unsigned int subindex = ( bit % ( 8 * sizeof ( value->element[0] ) ) );
-
-	return ( value->element[index] & ( 1 << subindex ) );
-}
-
-/**
- * Find highest bit set in big integer
- *
- * @v value0		Element 0 of big integer
- * @v size		Number of elements
- * @ret max_bit		Highest bit set + 1 (or 0 if no bits set)
- */
-static inline __attribute__ (( always_inline )) int
-bigint_max_set_bit_raw ( const uint32_t *value0, unsigned int size ) {
-	const uint32_t *value = ( value0 + size );
-	int max_bit = ( 8 * sizeof ( bigint_t ( size ) ) );
-	uint32_t value_i;
-
-	do {
-		value_i = *(--value);
-		max_bit -= ( 32 - fls ( value_i ) );
-		if ( value_i )
-			break;
-	} while ( --size );
-
-	return max_bit;
-}
-
-/**
- * Grow big integer
- *
- * @v source0		Element 0 of source big integer
- * @v source_size	Number of elements in source big integer
- * @v dest0		Element 0 of destination big integer
- * @v dest_size		Number of elements in destination big integer
- */
-static inline __attribute__ (( always_inline )) void
-bigint_grow_raw ( const uint32_t *source0, unsigned int source_size,
-		  uint32_t *dest0, unsigned int dest_size ) {
-	unsigned int pad_size = ( dest_size - source_size );
-
-	memcpy ( dest0, source0, sizeof ( bigint_t ( source_size ) ) );
-	memset ( ( dest0 + source_size ), 0, sizeof ( bigint_t ( pad_size ) ) );
-}
-
-/**
- * Shrink big integer
- *
- * @v source0		Element 0 of source big integer
- * @v source_size	Number of elements in source big integer
- * @v dest0		Element 0 of destination big integer
- * @v dest_size		Number of elements in destination big integer
- */
-static inline __attribute__ (( always_inline )) void
-bigint_shrink_raw ( const uint32_t *source0, unsigned int source_size __unused,
-		    uint32_t *dest0, unsigned int dest_size ) {
-
-	memcpy ( dest0, source0, sizeof ( bigint_t ( dest_size ) ) );
-}
-
-/**
- * Finalise big integer
- *
- * @v value0		Element 0 of big integer to finalise
- * @v size		Number of elements
- * @v out		Output buffer
- * @v len		Length of output buffer
- */
-static inline __attribute__ (( always_inline )) void
-bigint_done_raw ( const uint32_t *value0, unsigned int size __unused,
-		  void *out, size_t len ) {
-	const uint8_t *value_byte = ( ( const void * ) value0 );
-	uint8_t *out_byte = ( out + len );
-
-	/* Copy raw data in reverse order */
-	while ( len-- )
-		*(--out_byte) = *(value_byte++);
-}
-
-extern void bigint_multiply_raw ( const uint32_t *multiplicand0,
-				  const uint32_t *multiplier0,
-				  uint32_t *value0, unsigned int size );
-
-#endif /* _BITS_BIGINT_H */
diff --git a/src/arch/arm/include/bits/bitops.h b/src/arch/arm/include/bits/bitops.h
deleted file mode 100644
index 9a5fe14c2..000000000
--- a/src/arch/arm/include/bits/bitops.h
+++ /dev/null
@@ -1,100 +0,0 @@
-#ifndef _BITS_BITOPS_H
-#define _BITS_BITOPS_H
-
-/** @file
- *
- * ARM bit operations
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#include <stdint.h>
-
-/**
- * Test and set bit atomically
- *
- * @v bit		Bit to set
- * @v bits		Bit field
- * @ret old		Old value of bit (zero or non-zero)
- */
-static inline __attribute__ (( always_inline )) int
-test_and_set_bit ( unsigned int bit, volatile void *bits ) {
-	unsigned int index = ( bit / 32 );
-	unsigned int offset = ( bit % 32 );
-	volatile uint32_t *dword = ( ( ( volatile uint32_t * ) bits ) + index );
-	uint32_t mask = ( 1UL << offset );
-	uint32_t old;
-	uint32_t new;
-	uint32_t flag;
-
-	__asm__ __volatile__ ( "\n1:\n\t"
-			       "ldrex %0, %3\n\t"
-			       "orr %1, %0, %4\n\t"
-			       "strex %2, %1, %3\n\t"
-			       "tst %2, %2\n\t"
-			       "bne 1b\n\t"
-			       : "=&r" ( old ), "=&r" ( new ), "=&l" ( flag ),
-				 "+Q" ( *dword )
-			       : "r" ( mask )
-			       : "cc" );
-
-	return ( old & mask );
-}
-
-/**
- * Test and clear bit atomically
- *
- * @v bit		Bit to set
- * @v bits		Bit field
- * @ret old		Old value of bit (zero or non-zero)
- */
-static inline __attribute__ (( always_inline )) int
-test_and_clear_bit ( unsigned int bit, volatile void *bits ) {
-	unsigned int index = ( bit / 32 );
-	unsigned int offset = ( bit % 32 );
-	volatile uint32_t *dword = ( ( ( volatile uint32_t * ) bits ) + index );
-	uint32_t mask = ( 1UL << offset );
-	uint32_t old;
-	uint32_t new;
-	uint32_t flag;
-
-	__asm__ __volatile__ ( "\n1:\n\t"
-			       "ldrex %0, %3\n\t"
-			       "bic %1, %0, %4\n\t"
-			       "strex %2, %1, %3\n\t"
-			       "tst %2, %2\n\t"
-			       "bne 1b\n\t"
-			       : "=&r" ( old ), "=&r" ( new ), "=&l" ( flag ),
-				 "+Q" ( *dword )
-			       : "r" ( mask )
-			       : "cc" );
-
-	return ( old & mask );
-}
-
-/**
- * Set bit atomically
- *
- * @v bit		Bit to set
- * @v bits		Bit field
- */
-static inline __attribute__ (( always_inline )) void
-set_bit ( unsigned int bit, volatile void *bits ) {
-
-	test_and_set_bit ( bit, bits );
-}
-
-/**
- * Clear bit atomically
- *
- * @v bit		Bit to set
- * @v bits		Bit field
- */
-static inline __attribute__ (( always_inline )) void
-clear_bit ( unsigned int bit, volatile void *bits ) {
-
-	test_and_clear_bit ( bit, bits );
-}
-
-#endif /* _BITS_BITOPS_H */
diff --git a/src/arch/arm/include/bits/byteswap.h b/src/arch/arm/include/bits/byteswap.h
deleted file mode 100644
index 1fc884bd8..000000000
--- a/src/arch/arm/include/bits/byteswap.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef _BITS_BYTESWAP_H
-#define _BITS_BYTESWAP_H
-
-/** @file
- *
- * Byte-order swapping functions
- *
- */
-
-#include <stdint.h>
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-static inline __attribute__ (( always_inline, const )) uint16_t
-__bswap_variable_16 ( uint16_t x ) {
-	__asm__ ( "rev16 %0, %1" : "=l" ( x ) : "l" ( x ) );
-	return x;
-}
-
-static inline __attribute__ (( always_inline )) void
-__bswap_16s ( uint16_t *x ) {
-	*x = __bswap_variable_16 ( *x );
-}
-
-static inline __attribute__ (( always_inline, const )) uint32_t
-__bswap_variable_32 ( uint32_t x ) {
-	__asm__ ( "rev %0, %1" : "=l" ( x ) : "l" ( x ) );
-	return x;
-}
-
-static inline __attribute__ (( always_inline )) void
-__bswap_32s ( uint32_t *x ) {
-	*x = __bswap_variable_32 ( *x );
-}
-
-static inline __attribute__ (( always_inline, const )) uint64_t
-__bswap_variable_64 ( uint64_t x ) {
-	uint32_t in_high = ( x >> 32 );
-	uint32_t in_low = ( x & 0xffffffffUL );
-	uint32_t out_high = __bswap_variable_32 ( in_low );
-	uint32_t out_low = __bswap_variable_32 ( in_high );
-
-	return ( ( ( ( uint64_t ) out_high ) << 32 ) |
-		 ( ( uint64_t ) out_low ) );
-}
-
-static inline __attribute__ (( always_inline )) void
-__bswap_64s ( uint64_t *x ) {
-	*x = __bswap_variable_64 ( *x );
-}
-
-#endif
diff --git a/src/arch/arm/include/bits/compiler.h b/src/arch/arm/include/bits/compiler.h
deleted file mode 100644
index e420cf922..000000000
--- a/src/arch/arm/include/bits/compiler.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _BITS_COMPILER_H
-#define _BITS_COMPILER_H
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-/** Dummy relocation type */
-#define RELOC_TYPE_NONE R_ARM_NONE
-
-#ifndef ASSEMBLY
-
-#define __asmcall
-#define __libgcc
-
-#endif /* ASSEMBLY */
-
-#endif /*_BITS_COMPILER_H */
diff --git a/src/arch/arm/include/bits/profile.h b/src/arch/arm/include/bits/profile.h
deleted file mode 100644
index 2b15d1604..000000000
--- a/src/arch/arm/include/bits/profile.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef _BITS_PROFILE_H
-#define _BITS_PROFILE_H
-
-/** @file
- *
- * Profiling
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-#include <stdint.h>
-
-/**
- * Get profiling timestamp
- *
- * @ret timestamp	Timestamp
- */
-static inline __attribute__ (( always_inline )) uint64_t
-profile_timestamp ( void ) {
-	uint32_t cycles;
-
-	/* Read cycle counter */
-	__asm__ __volatile__ ( "mcr p15, 0, %1, c9, c12, 0\n\t"
-			       "mrc p15, 0, %0, c9, c13, 0\n\t"
-			       : "=r" ( cycles ) : "r" ( 1 ) );
-	return cycles;
-}
-
-#endif /* _BITS_PROFILE_H */
diff --git a/src/arch/arm/include/bits/stdint.h b/src/arch/arm/include/bits/stdint.h
deleted file mode 100644
index fe1f9946a..000000000
--- a/src/arch/arm/include/bits/stdint.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _BITS_STDINT_H
-#define _BITS_STDINT_H
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-typedef __SIZE_TYPE__		size_t;
-typedef signed long		ssize_t;
-typedef signed long		off_t;
-
-typedef unsigned char		uint8_t;
-typedef unsigned short		uint16_t;
-typedef unsigned int		uint32_t;
-typedef unsigned long long	uint64_t;
-
-typedef signed char		int8_t;
-typedef signed short		int16_t;
-typedef signed int		int32_t;
-typedef signed long long	int64_t;
-
-typedef unsigned long		physaddr_t;
-typedef unsigned long		intptr_t;
-
-#endif /* _BITS_STDINT_H */
diff --git a/src/arch/arm/include/bits/strings.h b/src/arch/arm/include/bits/strings.h
deleted file mode 100644
index adbd5f4b4..000000000
--- a/src/arch/arm/include/bits/strings.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#ifndef _BITS_STRINGS_H
-#define _BITS_STRINGS_H
-
-/** @file
- *
- * String functions
- *
- */
-
-FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
-
-/**
- * Find first (i.e. least significant) set bit
- *
- * @v value		Value
- * @ret lsb		Least significant bit set in value (LSB=1), or zero
- */
-static inline __attribute__ (( always_inline )) int __ffsl ( long value ) {
-	unsigned long bits = value;
-	unsigned long lsb;
-	unsigned int lz;
-
-	/* Extract least significant set bit */
-	lsb = ( bits & -bits );
-
-	/* Count number of leading zeroes before LSB */
-	__asm__ ( "clz %0, %1" : "=r" ( lz ) : "r" ( lsb ) );
-
-	return ( 32 - lz );
-}
-
-/**
- * Find first (i.e. least significant) set bit
- *
- * @v value		Value
- * @ret lsb		Least significant bit set in value (LSB=1), or zero
- */
-static inline __attribute__ (( always_inline )) int __ffsll ( long long value ){
-	unsigned long high = ( value >> 32 );
-	unsigned long low = ( value >> 0 );
-
-	if ( low ) {
-		return ( __ffsl ( low ) );
-	} else if ( high ) {
-		return ( 32 + __ffsl ( high ) );
-	} else {
-		return 0;
-	}
-}
-
-/**
- * Find last (i.e. most significant) set bit
- *
- * @v value		Value
- * @ret msb		Most significant bit set in value (LSB=1), or zero
- */
-static inline __attribute__ (( always_inline )) int __flsl ( long value ) {
-	unsigned int lz;
-
-	/* Count number of leading zeroes */
-	__asm__ ( "clz %0, %1" : "=r" ( lz ) : "r" ( value ) );
-
-	return ( 32 - lz );
-}
-
-/**
- * Find last (i.e. most significant) set bit
- *
- * @v value		Value
- * @ret msb		Most significant bit set in value (LSB=1), or zero
- */
-static inline __attribute__ (( always_inline )) int __flsll ( long long value ){
-	unsigned long high = ( value >> 32 );
-	unsigned long low = ( value >> 0 );
-
-	if ( high ) {
-		return ( 32 + __flsl ( high ) );
-	} else if ( low ) {
-		return ( __flsl ( low ) );
-	} else {
-		return 0;
-	}
-}
-
-#endif /* _BITS_STRINGS_H */