change to correct enums
Merge pull request #5532 from chinhodado/patch-2

change to correct enums
x86jit: Add a missing unknown prefix check.
Merge remote-tracking branch 'origin/master' into master_0.9.7
fix a mistake in a logic condition
Merge pull request #5536 from chinhodado/patch-3

fix a mistake in a logic condition
Merge remote-tracking branch 'origin/master' into master_0.9.7