Merge sleds code.

.gitattributes

@@ -6,6 +6,8 @@ include/dollop_man.h -text
 include/memory_space.h -text
 include/range.h -text
 include/zipr.h -text
+include/zipr_constants.h -text
 include/zipr_options.h -text
 include/zipr_plugin.h -text
 include/zipr_sdk.h -text
+/sleds.zipr_sdk.patch -text

include/memory_space.h

@@ -46,6 +46,7 @@ class MemorySpace_t : public std::map<RangeAddress_t,char>
 		virtual void SplitFreeRange(RangeAddress_t addr)=0;
 		virtual void SplitFreeRange(Range_t range)=0;
 		virtual void MergeFreeRange(RangeAddress_t addr)=0;
+		virtual void MergeFreeRange(Range_t range)=0;
 		virtual RangeSet_t::iterator FindFreeRange(RangeAddress_t addr)=0;
 		virtual Range_t GetFreeRange(int size)=0;
 		virtual std::list<Range_t> GetFreeRanges(size_t size = 0) = 0;

include/zipr_constants.h

+/***************************************************************************
+ * Copyright (c)  2014  Zephyr Software LLC. All rights reserved.
+ *
+ * This software is furnished under a license and/or other restrictive
+ * terms and may be used and copied only in accordance with such terms
+ * and the inclusion of the above copyright notice. This software or
+ * any other copies thereof may not be provided or otherwise made
+ * available to any other person without the express written consent
+ * of an authorized representative of Zephyr Software LCC. Title to,
+ * ownership of, and all rights in the software is retained by
+ * Zephyr Software LCC.
+ *
+ * Zephyr Software LLC. Proprietary Information
+ *
+ * Unless otherwise specified, the information contained in this
+ * directory, following this legend, and/or referenced herein is
+ * Zephyr Software LLC. (Zephyr) Proprietary Information.
+ *
+ * CONTACT
+ *
+ * For technical assistance, contact Zephyr Software LCC. at:
+ *
+ *
+ * Zephyr Software, LLC
+ * 2040 Tremont Rd
+ * Charlottesville, VA 22911
+ *
+ * E-mail: jwd@zephyr-software.com
+ **************************************************************************/
+
+
+
+#ifndef ZIPR_CONSTANTS_H
+#define ZIPR_CONSTANTS_H
+
+namespace Zipr_SDK {
+	enum {
+		DEFAULT_TRAMPOLINE_SIZE=5
+	};
+};
+
+#endif

sleds.zipr_sdk.patch

+Index: include/memory_space.h
+===================================================================
+--- include/memory_space.h	(revision 21014)
++++ include/memory_space.h	(working copy)
+@@ -46,6 +46,7 @@
+ 		virtual void SplitFreeRange(RangeAddress_t addr)=0;
+ 		virtual void SplitFreeRange(Range_t range)=0;
+ 		virtual void MergeFreeRange(RangeAddress_t addr)=0;
++		virtual void MergeFreeRange(Range_t range)=0;
+ 		virtual RangeSet_t::iterator FindFreeRange(RangeAddress_t addr)=0;
+ 		virtual Range_t GetFreeRange(int size)=0;
+ 		virtual std::list<Range_t> GetFreeRanges(size_t size = 0) = 0;
+Index: include/zipr_constants.h
+===================================================================
+--- include/zipr_constants.h	(revision 0)
++++ include/zipr_constants.h	(working copy)
+@@ -0,0 +1,42 @@
++/***************************************************************************
++ * Copyright (c)  2014  Zephyr Software LLC. All rights reserved.
++ *
++ * This software is furnished under a license and/or other restrictive
++ * terms and may be used and copied only in accordance with such terms
++ * and the inclusion of the above copyright notice. This software or
++ * any other copies thereof may not be provided or otherwise made
++ * available to any other person without the express written consent
++ * of an authorized representative of Zephyr Software LCC. Title to,
++ * ownership of, and all rights in the software is retained by
++ * Zephyr Software LCC.
++ *
++ * Zephyr Software LLC. Proprietary Information
++ *
++ * Unless otherwise specified, the information contained in this
++ * directory, following this legend, and/or referenced herein is
++ * Zephyr Software LLC. (Zephyr) Proprietary Information.
++ *
++ * CONTACT
++ *
++ * For technical assistance, contact Zephyr Software LCC. at:
++ *
++ *
++ * Zephyr Software, LLC
++ * 2040 Tremont Rd
++ * Charlottesville, VA 22911
++ *
++ * E-mail: jwd@zephyr-software.com
++ **************************************************************************/
++
++
++
++#ifndef ZIPR_CONSTANTS_H
++#define ZIPR_CONSTANTS_H
++
++namespace Zipr_SDK {
++	enum {
++		DEFAULT_TRAMPOLINE_SIZE=5
++	};
++};
++
++#endif