diff options
| author |  Gerd Zellweger <mail@gerdzellweger.com>
| 2017-10-17 10:15:12 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2017-10-17 10:15:12 +0200 |
| commit | 9cba8c9b18c24c549999f687aed1d3e5cbf90f6e (patch) | |
| tree | f6ea88f2be9b169520c1bb534013560b6726fc95 /src/shared/descriptor.rs | |
| parent | 6b18a71119bdb3c16bd5c6f85208597711785df9 (diff) | |
| parent | 31183183e4dd295b8f48c21873a8cdfa60ba3c7d (diff) | |
| download | rust-x86-9cba8c9b18c24c549999f687aed1d3e5cbf90f6e.tar.gz rust-x86-9cba8c9b18c24c549999f687aed1d3e5cbf90f6e.tar.zst rust-x86-9cba8c9b18c24c549999f687aed1d3e5cbf90f6e.zip | |
Merge pull request #29 from sergey-v-galtsev/segmentation-fixes
Several small fixes for shared/descriptor.rs and shared/segmentation.rs.
Diffstat (limited to 'src/shared/descriptor.rs')
| -rw-r--r-- | src/shared/descriptor.rs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/shared/descriptor.rs b/src/shared/descriptor.rs index 32abb79..7fdf098 100644 --- a/src/shared/descriptor.rs +++ b/src/shared/descriptor.rs @@ -107,7 +107,7 @@ bitflags!{ // Code => permissions const FLAGS_TYPE_SEG_C_READ = 0b1_0010, - const FLAGS_TYPE_SEG_D_CONFORMING = 0b1_0100, + const FLAGS_TYPE_SEG_C_CONFORMING = 0b1_0100, /// Data Read-Only const FLAGS_TYPE_SEG_D_RO = FLAGS_TYPE_DATA.bits, @@ -139,32 +139,32 @@ bitflags!{ | FLAGS_TYPE_SEG_ACCESSED.bits, /// Code Execute-Only - const FLAGS_TYPE_SEG_C_EO = FLAGS_TYPE_DATA.bits, + const FLAGS_TYPE_SEG_C_EO = FLAGS_TYPE_CODE.bits, /// Code Execute-Only, accessed - const FLAGS_TYPE_SEG_C_EOA = FLAGS_TYPE_DATA.bits + const FLAGS_TYPE_SEG_C_EOA = FLAGS_TYPE_CODE.bits | FLAGS_TYPE_SEG_ACCESSED.bits, /// Code Execute/Read - const FLAGS_TYPE_SEG_C_ER = FLAGS_TYPE_DATA.bits + const FLAGS_TYPE_SEG_C_ER = FLAGS_TYPE_CODE.bits | FLAGS_TYPE_SEG_C_READ.bits, /// Code Execute/Read, accessed - const FLAGS_TYPE_SEG_C_ERA = FLAGS_TYPE_DATA.bits + const FLAGS_TYPE_SEG_C_ERA = FLAGS_TYPE_CODE.bits | FLAGS_TYPE_SEG_C_READ.bits | FLAGS_TYPE_SEG_ACCESSED.bits, /// Code Execute-Only, conforming - const FLAGS_TYPE_SEG_C_EOC = FLAGS_TYPE_DATA.bits - | FLAGS_TYPE_SEG_D_CONFORMING.bits, + const FLAGS_TYPE_SEG_C_EOC = FLAGS_TYPE_CODE.bits + | FLAGS_TYPE_SEG_C_CONFORMING.bits, /// Code Execute-Only, conforming, accessed - const FLAGS_TYPE_SEG_C_EOCA = FLAGS_TYPE_DATA.bits - | FLAGS_TYPE_SEG_D_CONFORMING.bits + const FLAGS_TYPE_SEG_C_EOCA = FLAGS_TYPE_CODE.bits + | FLAGS_TYPE_SEG_C_CONFORMING.bits | FLAGS_TYPE_SEG_ACCESSED.bits, /// Code Execute/Read, conforming - const FLAGS_TYPE_SEG_C_ERC = FLAGS_TYPE_DATA.bits + const FLAGS_TYPE_SEG_C_ERC = FLAGS_TYPE_CODE.bits | FLAGS_TYPE_SEG_C_READ.bits - | FLAGS_TYPE_SEG_D_CONFORMING.bits, + | FLAGS_TYPE_SEG_C_CONFORMING.bits, /// Code Execute/Read, conforming, accessed - const FLAGS_TYPE_SEG_C_ERCA = FLAGS_TYPE_DATA.bits + const FLAGS_TYPE_SEG_C_ERCA = FLAGS_TYPE_CODE.bits | FLAGS_TYPE_SEG_C_READ.bits - | FLAGS_TYPE_SEG_D_CONFORMING.bits + | FLAGS_TYPE_SEG_C_CONFORMING.bits | FLAGS_TYPE_SEG_ACCESSED.bits, } } |