X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fhelper%2Fbinarybuffer.h;h=49ea6b32be0092e0f485dc214e7dfb44e7739d5e;hb=c18947b947064e7eceed8047c42d4c8dfd8ae964;hp=6f39e7cf45d1efd3a39780e9d9d2d531be9aa5df;hpb=a582e9a8d183c56d1aa8ae18afc1c11e2cbd6d2d;p=openocd.git

diff --git a/src/helper/binarybuffer.h b/src/helper/binarybuffer.h
index 6f39e7cf45..49ea6b32be 100644
--- a/src/helper/binarybuffer.h
+++ b/src/helper/binarybuffer.h
@@ -2,6 +2,9 @@
  *   Copyright (C) 2004, 2005 by Dominic Rath                              *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -26,23 +29,72 @@
  * flip_u32 inverses the bit order inside a 32-bit word (31..0 -> 0..31)
  */
 
-extern int buf_set_u32(u8* buffer, unsigned int first, unsigned int num, u32 value);
-extern u32 buf_get_u32(u8* buffer, unsigned int first, unsigned int num);
+/* inlining this will help show what fn that is taking time during profiling. */
+static inline void buf_set_u32(uint8_t* buffer, unsigned int first, unsigned int num, u32 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<first+num; i++)
+		{
+			if (((value >> (i-first))&1) == 1)
+				buffer[i/8] |= 1 << (i%8);
+			else
+				buffer[i/8] &= ~(1 << (i%8));
+		}
+	}
+}
+static inline u32 buf_get_u32(const uint8_t* buffer, unsigned int first, unsigned int 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<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);
 
-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);
+extern int buf_cmp(const uint8_t *buf1, const uint8_t *buf2, int size);
+extern int buf_cmp_mask(const uint8_t *buf1, const uint8_t *buf2, const uint8_t *mask, int size);
+extern uint8_t* buf_cpy(const uint8_t *from, uint8_t *to, int 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);
+extern uint8_t* buf_set_ones(uint8_t *buf, int count);
+extern uint8_t* buf_set_buf(const uint8_t *src, int src_start, uint8_t *dst, int dst_start, int len);
 
-extern int str_to_buf(char* str, int len, u8 *bin_buf, int buf_size, int radix);
-extern char* buf_to_str(u8 *buf, int size, int radix);
+extern int str_to_buf(const char *str, int len, uint8_t *bin_buf, int buf_size, int radix);
+extern char* buf_to_str(const uint8_t *buf, int size, int radix);
 
-extern int buf_to_u32_handler(u8 *in_buf, void *priv);
+struct scan_field_s;
+extern int buf_to_u32_handler(uint8_t *in_buf, void *priv, struct scan_field_s *field);
 
 #define CEIL(m, n)	((m + n - 1) / n)
 
+/* read a u32 from a buffer in target memory endianness */
+static inline u32 fast_target_buffer_get_u32(const uint8_t *buffer, int little)
+{
+	if (little)
+		return le_to_h_u32(buffer);
+	else
+		return be_to_h_u32(buffer);
+}
+
 #endif /* BINARYBUFFER_H */