/[public]/psiconv/trunk/lib/psiconv/generate_simple.c
ViewVC logotype

Diff of /psiconv/trunk/lib/psiconv/generate_simple.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 79 Revision 168
… …
15 You should have received a copy of the GNU General Public License 15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 17 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
18*/ 18*/
19 19
20#include <string.h>
21
20#include "config.h" 22#include "config.h"
21#include "compat.h" 23#include "compat.h"
22 24
23#include "generate_routines.h" 25#include "generate_routines.h"
24#include "error.h" 26#include "error.h"
25 27
28#ifdef DMALLOC
29#include <dmalloc.h>
30#endif
31
32
26int psiconv_write_u8(psiconv_buffer buf,const psiconv_u8 value) 33int psiconv_write_u8(const psiconv_config config,psiconv_buffer buf,const psiconv_u8 value)
27{ 34{
28 return psiconv_buffer_add(buf,value); 35 return psiconv_buffer_add(buf,value);
29} 36}
30 37
31int psiconv_write_u16(psiconv_buffer buf,const psiconv_u16 value) 38int psiconv_write_u16(const psiconv_config config,psiconv_buffer buf,const psiconv_u16 value)
32{ 39{
33 int res; 40 int res;
34 if ((res = psiconv_buffer_add(buf,value & 0xff))) 41 if ((res = psiconv_buffer_add(buf,value & 0xff)))
35 return res; 42 return res;
36 return psiconv_buffer_add(buf,(value & 0xff00) >> 8); 43 return psiconv_buffer_add(buf,(value & 0xff00) >> 8);
37} 44}
38 45
39int psiconv_write_u32(psiconv_buffer buf,const psiconv_u32 value) 46int psiconv_write_u32(const psiconv_config config,psiconv_buffer buf,const psiconv_u32 value)
40{ 47{
41 int res; 48 int res;
42 if ((res = psiconv_buffer_add(buf,value & 0xff))) 49 if ((res = psiconv_buffer_add(buf,value & 0xff)))
43 return res; 50 return res;
44 if ((res = psiconv_buffer_add(buf,(value & 0xff00) >> 8))) 51 if ((res = psiconv_buffer_add(buf,(value & 0xff00) >> 8)))
… …
46 if ((res = psiconv_buffer_add(buf,(value & 0xff0000) >> 16))) 53 if ((res = psiconv_buffer_add(buf,(value & 0xff0000) >> 16)))
47 return res; 54 return res;
48 return psiconv_buffer_add(buf,(value & 0xff000000) >> 24); 55 return psiconv_buffer_add(buf,(value & 0xff000000) >> 24);
49} 56}
50 57
51int psiconv_write_S(psiconv_buffer buf, const psiconv_u32 value) 58int psiconv_write_S(const psiconv_config config,psiconv_buffer buf, const psiconv_u32 value)
52{ 59{
53 if (value < 0x40) 60 if (value < 0x40)
54 return psiconv_write_u8(buf,value * 4 + 2); 61 return psiconv_write_u8(config,buf,value * 4 + 2);
55 else if (value < 0x2000) 62 else if (value < 0x2000)
56 return psiconv_write_u16(buf,value * 8 + 3); 63 return psiconv_write_u16(config,buf,value * 8 + 3);
57 else { 64 else {
58 psiconv_warn(0,psiconv_buffer_length(buf), 65 psiconv_warn(config,0,psiconv_buffer_length(buf),
59 "Don't know how to write S value larger than 0x2000 " 66 "Don't know how to write S value larger than 0x2000 "
60 "(trying %x)",value); 67 "(trying %x)",value);
61 return -PSICONV_E_GENERATE; 68 return -PSICONV_E_GENERATE;
62 } 69 }
63} 70}
64 71
65int psiconv_write_X(psiconv_buffer buf, const psiconv_u32 value) 72int psiconv_write_X(const psiconv_config config,psiconv_buffer buf, const psiconv_u32 value)
66{ 73{
67 if (value < 0x80) 74 if (value < 0x80)
68 return psiconv_write_u8(buf,value * 2); 75 return psiconv_write_u8(config,buf,value * 2);
69 else if (value < 0x4000) 76 else if (value < 0x4000)
70 return psiconv_write_u16(buf,value * 4 + 1); 77 return psiconv_write_u16(config,buf,value * 4 + 1);
71 else if (value < 0x20000000) 78 else if (value < 0x20000000)
72 return psiconv_write_u16(buf,value * 8 + 3); 79 return psiconv_write_u16(config,buf,value * 8 + 3);
73 else { 80 else {
74 psiconv_warn(0,psiconv_buffer_length(buf), 81 psiconv_warn(config,0,psiconv_buffer_length(buf),
75 "Don't know how to write X value larger than 0x20000000 " 82 "Don't know how to write X value larger than 0x20000000 "
76 "(trying %x)",value); 83 "(trying %x)",value);
77 return -PSICONV_E_GENERATE; 84 return -PSICONV_E_GENERATE;
78 } 85 }
79} 86}
80 87
81int psiconv_write_offset(psiconv_buffer buf, const psiconv_u32 value) 88int psiconv_write_length(const psiconv_config config,psiconv_buffer buf, const psiconv_length_t value)
82{ 89{
83 return psiconv_write_u32(buf,value + psiconv_buffer_base_offset(buf)); 90 return psiconv_write_u32(config,buf,value * (1440.0/2.54) + 0.5);
84} 91}
85 92
86int psiconv_write_length(psiconv_buffer buf, const psiconv_length_t value) 93int psiconv_write_size(const psiconv_config config,psiconv_buffer buf, psiconv_size_t value)
87{ 94{
88 return psiconv_write_u32(buf,value * (1440.0/2.54) + 0.5); 95 return psiconv_write_u32(config,buf,value * 20.0 + 0.5);
89} 96}
90 97
91int psiconv_write_size(psiconv_buffer buf, psiconv_size_t value) 98int psiconv_write_bool(const psiconv_config config,psiconv_buffer buf, const psiconv_bool_t value)
92{ 99{
93 return psiconv_write_u32(buf,value * 20.0 + 0.5); 100 if ((value != psiconv_bool_true) && (value != psiconv_bool_false))
101 psiconv_warn(config,0,psiconv_buffer_length(buf),
102 "Boolean has non-enum value (found %d)",value);
103 return psiconv_write_u8(config,buf,value == psiconv_bool_false?0:1);
94} 104}
95 105
96int psiconv_write_bool(psiconv_buffer buf, const psiconv_bool_t value)
97{
98 if ((value != psiconv_bool_true) && (value != psiconv_bool_false))
99 psiconv_warn(0,psiconv_buffer_length(buf),
100 "Boolean has non-enum value (found %d)",value);
101 return psiconv_write_u8(buf,value == psiconv_bool_false?0:1);
102}
103
104int psiconv_write_string(psiconv_buffer buf, const psiconv_string_t value) 106int psiconv_write_string(const psiconv_config config,psiconv_buffer buf, const psiconv_string_t value)
105{ 107{
106 int res,i; 108 int res,i;
107 if (!value) { 109 if (!value) {
108 psiconv_warn(0,psiconv_buffer_length(buf), 110 psiconv_warn(config,0,psiconv_buffer_length(buf),
109 "NULL string"); 111 "NULL string");
110 return -PSICONV_E_GENERATE; 112 return -PSICONV_E_GENERATE;
111 } 113 }
112 if ((res = psiconv_write_S(buf,strlen(value)))) 114 if ((res = psiconv_write_S(config,buf,strlen(value))))
113 return res; 115 return res;
114 for (i = 0; i < strlen(value); i++) 116 for (i = 0; i < strlen(value); i++)
115 if ((res = psiconv_write_u8(buf,value[i]))) 117 if ((res = psiconv_write_u8(config,buf,value[i])))
116 return res; 118 return res;
117 return -PSICONV_E_OK; 119 return -PSICONV_E_OK;
118} 120}
121
122int psiconv_write_offset(const psiconv_config config,psiconv_buffer buf, psiconv_u32 id)
123{
124 return psiconv_buffer_add_reference(buf,id);
125}
Legend:
Removed from v.79  
changed lines
  Added in v.168
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26