1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
|
--- src/hardware/memory.cpp.origin 2015-06-16 01:18:13.155376562 +0200
+++ src/hardware/memory.cpp 2015-06-16 01:34:39.819386299 +0200
@@ -1109,28 +1109,28 @@
//save state support
extern void* VGA_PageHandler_Func[16];
-Bit32u Memory_PageHandler_table[] =
+Bit64u Memory_PageHandler_table[] =
{
- (Bit32u) NULL,
- (Bit32u) &ram_page_handler,
- (Bit32u) &rom_page_handler,
-
- (Bit32u) VGA_PageHandler_Func[0],
- (Bit32u) VGA_PageHandler_Func[1],
- (Bit32u) VGA_PageHandler_Func[2],
- (Bit32u) VGA_PageHandler_Func[3],
- (Bit32u) VGA_PageHandler_Func[4],
- (Bit32u) VGA_PageHandler_Func[5],
- (Bit32u) VGA_PageHandler_Func[6],
- (Bit32u) VGA_PageHandler_Func[7],
- (Bit32u) VGA_PageHandler_Func[8],
- (Bit32u) VGA_PageHandler_Func[9],
- (Bit32u) VGA_PageHandler_Func[10],
- (Bit32u) VGA_PageHandler_Func[11],
- (Bit32u) VGA_PageHandler_Func[12],
- (Bit32u) VGA_PageHandler_Func[13],
- (Bit32u) VGA_PageHandler_Func[14],
- (Bit32u) VGA_PageHandler_Func[15],
+ (Bit64u) NULL,
+ (Bit64u) &ram_page_handler,
+ (Bit64u) &rom_page_handler,
+
+ (Bit64u) VGA_PageHandler_Func[0],
+ (Bit64u) VGA_PageHandler_Func[1],
+ (Bit64u) VGA_PageHandler_Func[2],
+ (Bit64u) VGA_PageHandler_Func[3],
+ (Bit64u) VGA_PageHandler_Func[4],
+ (Bit64u) VGA_PageHandler_Func[5],
+ (Bit64u) VGA_PageHandler_Func[6],
+ (Bit64u) VGA_PageHandler_Func[7],
+ (Bit64u) VGA_PageHandler_Func[8],
+ (Bit64u) VGA_PageHandler_Func[9],
+ (Bit64u) VGA_PageHandler_Func[10],
+ (Bit64u) VGA_PageHandler_Func[11],
+ (Bit64u) VGA_PageHandler_Func[12],
+ (Bit64u) VGA_PageHandler_Func[13],
+ (Bit64u) VGA_PageHandler_Func[14],
+ (Bit64u) VGA_PageHandler_Func[15],
};
@@ -1150,12 +1150,12 @@
// assume 256MB max memory
- size_table = sizeof(Memory_PageHandler_table) / sizeof(Bit32u);
+ size_table = sizeof(Memory_PageHandler_table) / sizeof(Bit64u);
for( int lcv=0; lcv<memory.pages; lcv++ ) {
pagehandler_idx[lcv] = 0xff;
for( int lcv2=0; lcv2<size_table; lcv2++ ) {
- if( (Bit32u) memory.phandlers[lcv] == Memory_PageHandler_table[lcv2] ) {
+ if( (Bit64u) memory.phandlers[lcv] == Memory_PageHandler_table[lcv2] ) {
pagehandler_idx[lcv] = lcv2;
break;
}
--- src/hardware/opl.cpp.origin 2015-06-16 01:40:49.911942900 +0200
+++ src/hardware/opl.cpp 2015-06-16 01:41:54.351809024 +0200
@@ -1469,7 +1469,7 @@
for( int lcv=0; lcv<MAXOPERATORS; lcv++ ) {
- cur_wform_idx[lcv] = ((Bit32u) (op[lcv].cur_wform)) - ((Bit32u) &wavtable);
+ cur_wform_idx[lcv] = ((Bit64u) (op[lcv].cur_wform)) - ((Bit64u) &wavtable);
}
//****************************************************
@@ -1571,7 +1571,7 @@
//****************************************************
for( int lcv=0; lcv<MAXOPERATORS; lcv++ ) {
- op[lcv].cur_wform = (Bit16s *) ((Bit32u) &wavtable + cur_wform_idx[lcv]);
+ op[lcv].cur_wform = (Bit16s *) ((Bit64u) &wavtable + cur_wform_idx[lcv]);
}
}
--- src/hardware/dma.cpp.origin 2015-06-16 01:42:51.115024751 +0200
+++ src/hardware/dma.cpp 2015-06-16 01:44:04.361540100 +0200
@@ -542,9 +542,9 @@
{
Bit8u size;
- size = sizeof(dma_state_callback_table) / sizeof(Bit32u);
+ size = sizeof(dma_state_callback_table) / sizeof(Bit64u);
for( int lcv=0; lcv<size; lcv++ ) {
- if( (Bit32u) dma_state_callback_table[lcv] == addr ) return lcv;
+ if( (Bit64u) dma_state_callback_table[lcv] == addr ) return lcv;
}
@@ -553,9 +553,9 @@
}
-Bit32u POD_State_Index_DMA_Callback( Bit8u index )
+Bit64u POD_State_Index_DMA_Callback( Bit8u index )
{
- return (Bit32u) dma_state_callback_table[index];
+ return (Bit64u) dma_state_callback_table[index];
}
@@ -564,7 +564,7 @@
Bit8u dma_callback;
- dma_callback = POD_State_Find_DMA_Callback( (Bit32u) (callback) );
+ dma_callback = POD_State_Find_DMA_Callback( (Bit64u) (callback) );
//******************************************
//******************************************
@@ -600,7 +600,7 @@
Bit8u dma_callback;
- dma_callback = POD_State_Find_DMA_Callback( (Bit32u) (callback) );
+ dma_callback = POD_State_Find_DMA_Callback( (Bit64u) (callback) );
//******************************************
//******************************************
--- src/hardware/pic.cpp.origin 2015-06-16 01:36:06.012537505 +0200
+++ src/hardware/pic.cpp 2015-06-16 01:46:00.634634227 +0200
@@ -805,12 +805,12 @@
-Bit16u PIC_State_FindEvent( Bit32u addr ) {
+Bit16u PIC_State_FindEvent( Bit64u addr ) {
int size;
- size = sizeof(pic_state_event_table) / sizeof(Bit32u);
+ size = sizeof(pic_state_event_table) / sizeof(Bit64u);
for( int lcv=0; lcv<size; lcv++ ) {
- if( addr == (Bit32u) (pic_state_event_table[lcv]) ) return lcv;
+ if( addr == (Bit64u) (pic_state_event_table[lcv]) ) return lcv;
}
@@ -820,12 +820,12 @@
}
-Bit16u PIC_State_FindTimer( Bit32u addr ) {
+Bit16u PIC_State_FindTimer( Bit64u addr ) {
int size;
- size = sizeof(pic_state_timer_table) / sizeof(Bit32u);
+ size = sizeof(pic_state_timer_table) / sizeof(Bit64u);
for( int lcv=0; lcv<size; lcv++ ) {
- if( addr == (Bit32u) (pic_state_timer_table[lcv]) ) return lcv;
+ if( addr == (Bit64u) (pic_state_timer_table[lcv]) ) return lcv;
}
@@ -835,17 +835,17 @@
}
-Bit32u PIC_State_IndexEvent( Bit16u index ) {
+Bit64u PIC_State_IndexEvent( Bit16u index ) {
if( index == 0xffff ) return 0;
- return (Bit32u) (pic_state_event_table[index]);
+ return (Bit64u) (pic_state_event_table[index]);
}
-Bit32u PIC_State_IndexTimer( Bit16u index ) {
+Bit64u PIC_State_IndexTimer( Bit16u index ) {
if( index == 0xffff ) return 0;
- return (Bit32u) (pic_state_timer_table[index]);
+ return (Bit64u) (pic_state_timer_table[index]);
}
@@ -870,13 +870,13 @@
for( int lcv=0; lcv<PIC_QUEUESIZE; lcv++ ) {
- Bit32u pic_addr;
+ Bit64u pic_addr;
- pic_addr = (Bit32u) pic_queue.entries[lcv].next;
+ pic_addr = (Bit64u) pic_queue.entries[lcv].next;
pic_next_ptr[lcv] = 0xffff;
for( int lcv2=0; lcv2<PIC_QUEUESIZE; lcv2++ ) {
- if( pic_addr == (Bit32u) &pic_queue.entries[lcv2] ) {
+ if( pic_addr == (Bit64u) &pic_queue.entries[lcv2] ) {
pic_next_ptr[lcv] = lcv2;
break;
}
@@ -919,7 +919,7 @@
stream.write(reinterpret_cast<const char*>(&pic_queue.entries[lcv].value), sizeof(pic_queue.entries[lcv].value) );
// - function ptr
- event_idx = PIC_State_FindEvent( (Bit32u) (pic_queue.entries[lcv].pic_event) );
+ event_idx = PIC_State_FindEvent( (Bit64u) (pic_queue.entries[lcv].pic_event) );
stream.write(reinterpret_cast<const char*>(&event_idx), sizeof(event_idx) );
// - reloc ptr
@@ -947,7 +947,7 @@
ticker_ptr = firstticker;
for( int lcv=0; lcv<ticker_size; lcv++ ) {
// - function ptr
- ticker_handler_idx = PIC_State_FindTimer( (Bit32u) (ticker_ptr->handler) );
+ ticker_handler_idx = PIC_State_FindTimer( (Bit64u) (ticker_ptr->handler) );
stream.write(reinterpret_cast<const char*>(&ticker_handler_idx), sizeof(ticker_handler_idx) );
// - reloc new ptr (leave alone)
--- src/hardware/dbopl.cpp.origin 2015-06-16 01:48:18.407685663 +0200
+++ src/hardware/dbopl.cpp 2015-06-16 01:49:18.980895573 +0200
@@ -1538,7 +1538,7 @@
}
}
- wavebase_idx[lcv1][lcv2] = (Bit32u) chip.chan[lcv1].op[lcv2].waveBase - (Bit32u) &WaveTable;
+ wavebase_idx[lcv1][lcv2] = (Bit64u) chip.chan[lcv1].op[lcv2].waveBase - (Bit64u) &WaveTable;
}
@@ -1641,7 +1641,7 @@
for( int lcv2=0; lcv2<2; lcv2++ ) {
chip.chan[lcv1].op[lcv2].volHandler = VolumeHandlerTable[ volhandler_idx[lcv1][lcv2] ];
- chip.chan[lcv1].op[lcv2].waveBase = (Bit16s *) ((Bit32u) wavebase_idx[lcv1][lcv2] + (Bit32u) &WaveTable);
+ chip.chan[lcv1].op[lcv2].waveBase = (Bit16s *) ((Bit64u) wavebase_idx[lcv1][lcv2] + (Bit64u) &WaveTable);
}
|