X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Fbinarybuffer.h;h=633ed9e5dc6aa111189f9ed4a646c56357903d25;hp=7100b872f9749a4c8cffdf15e162ad6865844058;hb=adb8ec32dc7439aa3e34ab19f026e390ec129c10;hpb=68c598e88d5e09728ea845a81ab279c615bbaf0f diff --git a/src/helper/binarybuffer.h b/src/helper/binarybuffer.h index 7100b872f9..633ed9e5dc 100644 --- a/src/helper/binarybuffer.h +++ b/src/helper/binarybuffer.h @@ -2,7 +2,7 @@ * Copyright (C) 2004, 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * - * Copyright (C) 2007,2008 Øyvind Harboe * + * Copyright (C) 2007,2008 Øyvind Harboe * * oyvind.harboe@zylin.com * * * * This program is free software; you can redistribute it and/or modify * @@ -20,81 +20,145 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + #ifndef BINARYBUFFER_H #define BINARYBUFFER_H -#include "types.h" +#include "list.h" -/* support functions to access arbitrary bits in a byte array - * flip_u32 inverses the bit order inside a 32-bit word (31..0 -> 0..31) +/** @file + * Support functions to access arbitrary bits in a byte array */ -/* inlining this will help show what fn that is taking time during profiling. */ -static __inline void buf_set_u32(u8* buffer, unsigned int first, unsigned int num, u32 value) +/** + * Sets @c num bits in @c _buffer, starting at the @c first bit, + * using the bits in @c value. This routine fast-paths writes + * of little-endian, byte-aligned, 32-bit words. + * @param _buffer The buffer whose bits will be set. + * @param first The bit offset in @c _buffer to start writing (0-31). + * @param num The number of bits from @c value to copy (1-32). + * @param value Up to 32 bits that will be copied to _buffer. + */ +static inline void buf_set_u32(void *_buffer, + unsigned first, unsigned num, uint32_t value) { - if ((num==32)&&(first==0)) - { - buffer[3]=(value>>24)&0xff; - buffer[2]=(value>>16)&0xff; - buffer[1]=(value>>8)&0xff; - buffer[0]=(value>>0)&0xff; - } else - { - unsigned int i; - - for (i=first; i> (i-first))&1) == 1) - buffer[i/8] |= 1 << (i%8); + uint8_t *buffer = (uint8_t *)_buffer; + + if ((num == 32) && (first == 0)) { + buffer[3] = (value >> 24) & 0xff; + buffer[2] = (value >> 16) & 0xff; + buffer[1] = (value >> 8) & 0xff; + buffer[0] = (value >> 0) & 0xff; + } else { + for (unsigned i = first; i < first + num; i++) { + if (((value >> (i - first)) & 1) == 1) + buffer[i / 8] |= 1 << (i % 8); else - buffer[i/8] &= ~(1 << (i%8)); + buffer[i / 8] &= ~(1 << (i % 8)); } } } -static __inline u32 buf_get_u32(u8* buffer, unsigned int first, unsigned int num) +/** + * Retrieves @c num bits from @c _buffer, starting at the @c first bit, + * returning the bits in a 32-bit word. This routine fast-paths reads + * of little-endian, byte-aligned, 32-bit words. + * @param _buffer The buffer whose bits will be read. + * @param first The bit offset in @c _buffer to start reading (0-31). + * @param num The number of bits from @c _buffer to read (1-32). + * @returns Up to 32-bits that were read from @c _buffer. + */ +static inline uint32_t buf_get_u32(const void *_buffer, + unsigned first, unsigned num) { - if ((num==32)&&(first==0)) - { - return (((u32)buffer[3])<<24)|(((u32)buffer[2])<<16)|(((u32)buffer[1])<<8)|(((u32)buffer[0])<<0); - } else - { - u32 result = 0; - unsigned int i; - - for (i=first; i>(i%8))&1) == 1) - result |= 1 << (i-first); + uint8_t *buffer = (uint8_t *)_buffer; + + if ((num == 32) && (first == 0)) { + return (((uint32_t)buffer[3]) << 24) | + (((uint32_t)buffer[2]) << 16) | + (((uint32_t)buffer[1]) << 8) | + (((uint32_t)buffer[0]) << 0); + } else { + uint32_t result = 0; + for (unsigned i = first; i < first + num; i++) { + if (((buffer[i / 8] >> (i % 8)) & 1) == 1) + result |= 1 << (i - first); } - return result; } } -extern u32 flip_u32(u32 value, unsigned int num); +/** + * Inverts the ordering of bits inside a 32-bit word (e.g. 31..0 -> 0..31). + * This routine can be used to flip smaller data types by using smaller + * values for @c width. + * @param value The word to flip. + * @param width The number of bits in value (2-32). + * @returns A 32-bit word with @c value in reversed bit-order. + */ +uint32_t flip_u32(uint32_t value, unsigned width); -extern int buf_cmp(u8 *buf1, u8 *buf2, int size); -extern int buf_cmp_mask(u8 *buf1, u8 *buf2, u8 *mask, int size); -extern u8* buf_cpy(u8 *from, u8 *to, int size); +bool buf_cmp(const void *buf1, const void *buf2, unsigned size); +bool buf_cmp_mask(const void *buf1, const void *buf2, + const void *mask, unsigned size); -extern u8* buf_set_ones(u8 *buf, int count); -extern u8* buf_set_buf(u8 *src, int src_start, u8 *dst, int dst_start, int len); +/** + * Copies @c size bits out of @c from and into @c to. Any extra + * bits in the final byte will be set to zero. + * @param from The buffer to copy into @c to. + * @param to The buffer that will receive the copy of @c from. + * @param size The number of bits to copy. + */ +void *buf_cpy(const void *from, void *to, unsigned size); -extern int str_to_buf(const char *str, int len, u8 *bin_buf, int buf_size, int radix); -extern char* buf_to_str(const u8 *buf, int size, int radix); +/** + * Set the contents of @c buf with @c count bits, all set to 1. + * @param buf The buffer to fill with ones. + * @param size The number of bits. + * @returns The original buffer (@c buf). + */ +void *buf_set_ones(void *buf, unsigned size); -struct scan_field_s; -extern int buf_to_u32_handler(u8 *in_buf, void *priv, struct scan_field_s *field); +void *buf_set_buf(const void *src, unsigned src_start, + void *dst, unsigned dst_start, unsigned len); -#define CEIL(m, n) ((m + n - 1) / n) +int str_to_buf(const char *str, unsigned len, + void *bin_buf, unsigned buf_size, unsigned radix); +char *buf_to_str(const void *buf, unsigned size, unsigned radix); -/* read a u32 from a buffer in target memory endianness */ -static __inline u32 fast_target_buffer_get_u32(u8 *buffer, int little) +/* read a uint32_t from a buffer in target memory endianness */ +static inline uint32_t fast_target_buffer_get_u32(const void *p, bool le) { - if (little) - return le_to_h_u32(buffer); - else - return be_to_h_u32(buffer); + return le ? le_to_h_u32(p) : be_to_h_u32(p); } +static inline void bit_copy(uint8_t *dst, unsigned dst_offset, const uint8_t *src, + unsigned src_offset, unsigned bit_count) +{ + buf_set_buf(src, src_offset, dst, dst_offset, bit_count); +} + +struct bit_copy_queue { + struct list_head list; +}; + +struct bit_copy_queue_entry { + uint8_t *dst; + unsigned dst_offset; + const uint8_t *src; + unsigned src_offset; + unsigned bit_count; + struct list_head list; +}; + +void bit_copy_queue_init(struct bit_copy_queue *q); +int bit_copy_queued(struct bit_copy_queue *q, uint8_t *dst, unsigned dst_offset, const uint8_t *src, + unsigned src_offset, unsigned bit_count); +void bit_copy_execute(struct bit_copy_queue *q); +void bit_copy_discard(struct bit_copy_queue *q); + +/* functions to convert to/from hex encoded buffer + * used in ti-icdi driver and gdb server */ +int unhexify(char *bin, const char *hex, int count); +int hexify(char *hex, const char *bin, int count, int out_maxlen); + #endif /* BINARYBUFFER_H */