Apple-2-Tools/atrcopy
1
0
Fork 0
mirror of https://github.com/robmcmullen/atrcopy.git synced 2024-11-25 16:32:07 +00:00
Code Issues Projects Releases Wiki Activity

Changed to labeled bit mask constants rather than hard-coded bit values

Browse Source 
* changed to one user bit mask value rather than separate bits
This commit is contained in:
Rob McMullen 2016-04-18 11:54:29 -07:00
parent e9640269f9
commit 02ba76f358
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
atrcopy/__init__.py
View File

@ -11,7 +11,7 @@ from errors import *
from ataridos import AtariDosDiskImage, AtariDosFile from ataridos import AtariDosDiskImage, AtariDosFile
from diskimages import AtrHeader, BootDiskImage from diskimages import AtrHeader, BootDiskImage
from kboot import KBootImage from kboot import KBootImage
from segments import SegmentData, SegmentSaver, DefaultSegment, EmptySegment, ObjSegment, RawSectorsSegment from segments import SegmentData, SegmentSaver, DefaultSegment, EmptySegment, ObjSegment, RawSectorsSegment, user_bit_mask, match_bit_mask, comment_bit_mask, data_bit_mask, selected_bit_mask
from spartados import SpartaDosDiskImage from spartados import SpartaDosDiskImage
from utils import to_numpy from utils import to_numpy

26
atrcopy/segments.py
View File

@ -3,6 +3,12 @@ import numpy as np
from errors import * from errors import *
from utils import to_numpy, to_numpy_list from utils import to_numpy, to_numpy_list
user_bit_mask = 0x0f
match_bit_mask = 0x10
comment_bit_mask = 0x20
data_bit_mask = 0x40
selected_bit_mask = 0x80
class SegmentSaver(object): class SegmentSaver(object):
name = "Raw Data" name = "Raw Data"
@ -265,7 +271,7 @@ class DefaultSegment(object):
def tostring(self): def tostring(self):
return self.data.tostring() return self.data.tostring()
def get_style_bits(self, match=False, comment=False, selected=False, data=False, user1=False, user2=False, user3=False, user4=False): def get_style_bits(self, match=False, comment=False, selected=False, data=False, user=0):
""" Return an int value that contains the specified style bits set. """ Return an int value that contains the specified style bits set.
Available styles for each byte are: Available styles for each byte are:
@ -276,22 +282,16 @@ class DefaultSegment(object):
data: labeled in the disassembler as a data region (i.e. not disassembled) data: labeled in the disassembler as a data region (i.e. not disassembled)
""" """
style_bits = 0 style_bits = 0
if user:
style_bits |= (user & user_bit_mask)
if match: if match:
style_bits |= 1 style_bits |= match_bit_mask
if comment: if comment:
style_bits |= 2 style_bits |= comment_bit_mask
if data: if data:
style_bits |= 4 style_bits |= data_bit_mask
if user1:
style_bits |= 8
if user2:
style_bits |= 0x10
if user3:
style_bits |= 0x20
if user4:
style_bits |= 0x40
if selected: if selected:
style_bits |= 0x80 style_bits |= selected_bit_mask
return style_bits return style_bits
def get_style_mask(self, **kwargs): def get_style_mask(self, **kwargs):