Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions python-capdl-tool/capdl/Allocator.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# SPDX-License-Identifier: BSD-2-Clause
#

from __future__ import absolute_import, division, print_function, \
unicode_literals

import abc
import collections
import logging
Expand Down
3 changes: 0 additions & 3 deletions python-capdl-tool/capdl/Cap.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# SPDX-License-Identifier: BSD-2-Clause
#

from __future__ import absolute_import, division, print_function, \
unicode_literals

from capdl.Object import Object, Frame, CNode, Endpoint, Notification, \
SchedControl, SMC

Expand Down
8 changes: 2 additions & 6 deletions python-capdl-tool/capdl/ELF.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
this module that relies on elftools, so it is possible to use this module
without elftools installed by not importing this particular file.
"""
from __future__ import absolute_import, division, print_function, \
unicode_literals
from future.utils import iteritems

from elftools.elf.elffile import ELFFile
from elftools.elf.constants import P_FLAGS
from .Object import TCB
Expand Down Expand Up @@ -149,12 +145,12 @@ def get_pages(self, infer_asid=True, pd=None, use_large_frames=True, addr_space=
existing_pages = []
if addr_space:
# Update symbols with their vaddrs in the AddressSpaceAllocator if we were given one
for (symbol, (sizes, caps)) in iteritems(addr_space.get_symbols_and_clear()):
for (symbol, (sizes, caps)) in addr_space.get_symbols_and_clear().items():
assert self.get_symbol_size(symbol) >= sum(sizes), \
"Symbol (%s:%d) must have same or greater size than supplied cap range (%d)" % (
symbol, self.get_symbol_size(symbol), sum(sizes))
existing_pages.append((self.get_symbol_vaddr(symbol), sizes, caps))
for (vaddr, (sizes, caps)) in iteritems(addr_space.get_external_regions_and_clear()):
for (vaddr, (sizes, caps)) in addr_space.get_external_regions_and_clear().items():
existing_pages.append((vaddr, sizes, caps))
for (size, cap) in zip(sizes, caps):
pages.add_page(vaddr, read=cap.read, write=cap.write, size=size)
Expand Down
3 changes: 0 additions & 3 deletions python-capdl-tool/capdl/Object.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
Definitions of kernel objects.
"""

from __future__ import absolute_import, division, print_function, \
unicode_literals

import abc
import math
import six
Expand Down
3 changes: 0 additions & 3 deletions python-capdl-tool/capdl/PageCollection.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
be used internally.
'''

from __future__ import absolute_import, division, print_function, \
unicode_literals

from .Cap import Cap
from .Object import ASIDPool, Frame
from .Spec import Spec
Expand Down
3 changes: 0 additions & 3 deletions python-capdl-tool/capdl/Spec.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# SPDX-License-Identifier: BSD-2-Clause
#

from __future__ import absolute_import, division, print_function, \
unicode_literals

from .Object import IRQ, Object
from .util import lookup_architecture, DomainDurationUnit

Expand Down
3 changes: 0 additions & 3 deletions python-capdl-tool/capdl/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# SPDX-License-Identifier: BSD-2-Clause
#

from __future__ import absolute_import, division, print_function, \
unicode_literals

from .Cap import Cap
from .ELF import ELF
from .Object import Frame, PageTable, PageDirectory, ASIDPool, CNode, Endpoint, \
Expand Down
3 changes: 0 additions & 3 deletions python-capdl-tool/capdl/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
Various internal utility functions. Pay no mind to this file.
"""

from __future__ import absolute_import, division, print_function, \
unicode_literals

import abc

from aenum import Enum
Expand Down
3 changes: 0 additions & 3 deletions python-capdl-tool/examples/allocation.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
# The module Allocator.py contains an object and CSpace allocator. This example
# shows how these can be used for convenience.

from __future__ import absolute_import, division, print_function, \
unicode_literals

# Add the root directory of this repository to your PYTHONPATH environment
# variable to enable the following import.
import capdl
Expand Down
3 changes: 0 additions & 3 deletions python-capdl-tool/examples/capdl-manipulation.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# SPDX-License-Identifier: BSD-2-Clause
#

from __future__ import absolute_import, division, print_function, \
unicode_literals

# Add the root directory of this repository to your PYTHONPATH environment
# variable to enable the following import.
import capdl
Expand Down
3 changes: 0 additions & 3 deletions python-capdl-tool/examples/construct-address-space.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# SPDX-License-Identifier: BSD-2-Clause
#

from __future__ import absolute_import, division, print_function, \
unicode_literals

# Add the root directory of this repository to your PYTHONPATH environment
# variable to enable the following import.
import capdl
Expand Down
3 changes: 0 additions & 3 deletions python-capdl-tool/examples/domains.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# SPDX-License-Identifier: BSD-2-Clause
#

from __future__ import absolute_import, division, print_function, \
unicode_literals

# Add the root directory of this repository to your PYTHONPATH environment
# variable to enable the following import.
import capdl
Expand Down
3 changes: 0 additions & 3 deletions python-capdl-tool/examples/to-capdl.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# SPDX-License-Identifier: BSD-2-Clause
#

from __future__ import absolute_import, division, print_function, \
unicode_literals

# Add the root directory of this repository to your PYTHONPATH environment
# variable to enable the following import.
import capdl
Expand Down
1 change: 0 additions & 1 deletion python-capdl-tool/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ six
sortedcontainers
concurrencytest
hypothesis
future
3 changes: 0 additions & 3 deletions python-capdl-tool/tests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
# SPDX-License-Identifier: BSD-2-Clause
#

from __future__ import absolute_import, division, print_function, \
unicode_literals

import unittest

from capdl import register_object_sizes
Expand Down
3 changes: 0 additions & 3 deletions python-capdl-tool/tests/allocator.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
# SPDX-License-Identifier: BSD-2-Clause
#

from __future__ import absolute_import, division, print_function, \
unicode_literals

import unittest

import hypothesis.strategies as st
Expand Down
2 changes: 0 additions & 2 deletions python-capdl-tool/tests/runall.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
This script is a quick way to execute the tests for all capdl-python modules.
"""

from __future__ import absolute_import, division, print_function, \
unicode_literals
from concurrencytest import ConcurrentTestSuite, fork_for_tests

import argparse
Expand Down
3 changes: 0 additions & 3 deletions python-capdl-tool/tests/testelf.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
# SPDX-License-Identifier: BSD-2-Clause
#

from __future__ import absolute_import, division, print_function, \
unicode_literals

import unittest

from capdl import ELF
Expand Down
3 changes: 0 additions & 3 deletions python-capdl-tool/tests/testmerge.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
# SPDX-License-Identifier: BSD-2-Clause
#

from __future__ import absolute_import, division, print_function, \
unicode_literals

import capdl
from tests import CapdlTestCase

Expand Down