Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Side by Side Diff: sim/v850/simops.c

Issue 11969036: Merge GDB 7.5.1 (Closed) Base URL: http://git.chromium.org/native_client/nacl-gdb.git@master
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « sim/v850/simops.h ('k') | sim/v850/v850.igen » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
None
OLDNEW
1 #include "sim-main.h" 1 #include "sim-main.h"
2 #include "v850_sim.h" 2 #include "v850_sim.h"
3 #include "simops.h" 3 #include "simops.h"
4 4
5 #include <sys/types.h> 5 #include <sys/types.h>
6 6
7 #ifdef HAVE_UTIME_H 7 #ifdef HAVE_UTIME_H
8 #include <utime.h> 8 #include <utime.h>
9 #endif 9 #endif
10 10
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 case 0x7: return (((((psw & PSW_S) != 0) ^ ((psw & PSW_OV) != 0)) || ((psw & PSW_Z) != 0)) != 0); 310 case 0x7: return (((((psw & PSW_S) != 0) ^ ((psw & PSW_OV) != 0)) || ((psw & PSW_Z) != 0)) != 0);
311 case 0x8: return ((psw & PSW_OV) == 0); 311 case 0x8: return ((psw & PSW_OV) == 0);
312 case 0x9: return ((psw & PSW_CY) == 0); 312 case 0x9: return ((psw & PSW_CY) == 0);
313 case 0xa: return ((psw & PSW_Z) == 0); 313 case 0xa: return ((psw & PSW_Z) == 0);
314 case 0xb: return ((((psw & PSW_CY) != 0) | ((psw & PSW_Z) != 0)) == 0); 314 case 0xb: return ((((psw & PSW_CY) != 0) | ((psw & PSW_Z) != 0)) == 0);
315 case 0xc: return ((psw & PSW_S) == 0); 315 case 0xc: return ((psw & PSW_S) == 0);
316 case 0xd: return ((psw & PSW_SAT) != 0); 316 case 0xd: return ((psw & PSW_SAT) != 0);
317 case 0xe: return ((((psw & PSW_S) != 0) ^ ((psw & PSW_OV) != 0)) == 0); 317 case 0xe: return ((((psw & PSW_S) != 0) ^ ((psw & PSW_OV) != 0)) == 0);
318 case 0xf: return (((((psw & PSW_S) != 0) ^ ((psw & PSW_OV) != 0)) || ((psw & PSW_Z) != 0)) == 0); 318 case 0xf: return (((((psw & PSW_S) != 0) ^ ((psw & PSW_OV) != 0)) || ((psw & PSW_Z) != 0)) == 0);
319 } 319 }

error: old chunk mismatch

OLDNEW
« no previous file with comments | « sim/v850/simops.h ('k') | sim/v850/v850.igen » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698