Revision 8c78881f hw/cirrus_vga.c

b/hw/cirrus_vga.c
280 280
}
281 281

  
282 282
#define ROP_NAME 0
283
#define ROP_OP(d, s) d = 0
283
#define ROP_FN(d, s) 0
284 284
#include "cirrus_vga_rop.h"
285 285

  
286 286
#define ROP_NAME src_and_dst
287
#define ROP_OP(d, s) d = (s) & (d)
287
#define ROP_FN(d, s) (s) & (d)
288 288
#include "cirrus_vga_rop.h"
289 289

  
290 290
#define ROP_NAME src_and_notdst
291
#define ROP_OP(d, s) d = (s) & (~(d))
291
#define ROP_FN(d, s) (s) & (~(d))
292 292
#include "cirrus_vga_rop.h"
293 293

  
294 294
#define ROP_NAME notdst
295
#define ROP_OP(d, s) d = ~(d)
295
#define ROP_FN(d, s) ~(d)
296 296
#include "cirrus_vga_rop.h"
297 297

  
298 298
#define ROP_NAME src
299
#define ROP_OP(d, s) d = s
299
#define ROP_FN(d, s) s
300 300
#include "cirrus_vga_rop.h"
301 301

  
302 302
#define ROP_NAME 1
303
#define ROP_OP(d, s) d = ~0
303
#define ROP_FN(d, s) ~0
304 304
#include "cirrus_vga_rop.h"
305 305

  
306 306
#define ROP_NAME notsrc_and_dst
307
#define ROP_OP(d, s) d = (~(s)) & (d)
307
#define ROP_FN(d, s) (~(s)) & (d)
308 308
#include "cirrus_vga_rop.h"
309 309

  
310 310
#define ROP_NAME src_xor_dst
311
#define ROP_OP(d, s) d = (s) ^ (d)
311
#define ROP_FN(d, s) (s) ^ (d)
312 312
#include "cirrus_vga_rop.h"
313 313

  
314 314
#define ROP_NAME src_or_dst
315
#define ROP_OP(d, s) d = (s) | (d)
315
#define ROP_FN(d, s) (s) | (d)
316 316
#include "cirrus_vga_rop.h"
317 317

  
318 318
#define ROP_NAME notsrc_or_notdst
319
#define ROP_OP(d, s) d = (~(s)) | (~(d))
319
#define ROP_FN(d, s) (~(s)) | (~(d))
320 320
#include "cirrus_vga_rop.h"
321 321

  
322 322
#define ROP_NAME src_notxor_dst
323
#define ROP_OP(d, s) d = ~((s) ^ (d))
323
#define ROP_FN(d, s) ~((s) ^ (d))
324 324
#include "cirrus_vga_rop.h"
325 325

  
326 326
#define ROP_NAME src_or_notdst
327
#define ROP_OP(d, s) d = (s) | (~(d))
327
#define ROP_FN(d, s) (s) | (~(d))
328 328
#include "cirrus_vga_rop.h"
329 329

  
330 330
#define ROP_NAME notsrc
331
#define ROP_OP(d, s) d = (~(s))
331
#define ROP_FN(d, s) (~(s))
332 332
#include "cirrus_vga_rop.h"
333 333

  
334 334
#define ROP_NAME notsrc_or_dst
335
#define ROP_OP(d, s) d = (~(s)) | (d)
335
#define ROP_FN(d, s) (~(s)) | (d)
336 336
#include "cirrus_vga_rop.h"
337 337

  
338 338
#define ROP_NAME notsrc_and_notdst
339
#define ROP_OP(d, s) d = (~(s)) & (~(d))
339
#define ROP_FN(d, s) (~(s)) & (~(d))
340 340
#include "cirrus_vga_rop.h"
341 341

  
342 342
static const cirrus_bitblt_rop_t cirrus_fwd_rop[16] = {

Also available in: Unified diff