psptool 3.4__tar.gz → 3.6__tar.gz

{psptool-3.4 → psptool-3.6}/.github/workflows/publish.yml

@@ -1,20 +1,22 @@
 name: Publish Python distribution to PyPI and TestPyPI
 
-on: push
+on:
+  push:
+    tags:
+      - '*'
 
 jobs:
   build:
     name: Build distribution
     runs-on: ubuntu-latest
-
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         persist-credentials: false
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
-        python-version: "3.11"
+        python-version: "3.14"
     - name: Install pypa/build
       run: >-
         python3 -m
@@ -24,7 +26,7 @@ jobs:
     - name: Build a binary wheel and a source tarball
       run: python3 -m build
     - name: Store the distribution packages
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: python-package-distributions
         path: dist/
@@ -43,7 +45,7 @@ jobs:
       id-token: write  # important for trusted publishing
     steps:
     - name: Download all the dists
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v8
       with:
         name: python-package-distributions
         path: dist/

psptool-3.6/.github/workflows/python-tests.yml

@@ -0,0 +1,136 @@
+name: Python tests
+
+on:
+  push:
+    branches: [master]
+  pull_request_target:
+
+jobs:
+  get-fixtures:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get fixtures
+        uses: actions/checkout@v6
+        with:
+          submodules: recursive
+          ssh-key: ${{ secrets.PSPTOOL_FIXTURES_NEW_PRIVATE_KEY }}
+
+      - name: Save fixtures
+        uses: actions/upload-artifact@v7
+        with:
+          name: saved-fixtures
+          path: tests/integration/fixtures
+          retention-days: 1
+
+  test:
+    needs: get-fixtures
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    strategy:
+      matrix:
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
+
+    steps:
+      - name: Checkout PR
+        uses: actions/checkout@v6
+        with:
+          ref: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.head.sha || github.sha }}
+
+      - name: Download fixtures
+        uses: actions/download-artifact@v8
+        with:
+          name: saved-fixtures
+          path: tests/integration/fixtures
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v6
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: 'pip'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install flake8
+          pip install psptrace  # for integration tests
+          pip install .
+
+      - name: Lint with flake8
+        run: |
+          # stop the build if there are Python syntax errors or undefined names
+          flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+          # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+          flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+      - name: Test with unittest
+        run: |
+          python -m unittest discover -s tests -v
+
+  create-metrics:
+    runs-on: ubuntu-latest
+    needs: get-fixtures
+    permissions:
+      contents: read
+    steps:
+      - name: Checkout PR
+        uses: actions/checkout@v6
+        with:
+          ref: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.head.sha || github.sha }}
+
+      - name: Download fixtures
+        uses: actions/download-artifact@v8
+        with:
+          name: saved-fixtures
+          path: tests/integration/fixtures
+
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.14"
+          cache: 'pip'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install .
+
+      - name: Create Metrics
+        run: |
+          python tests/gha_metrics.py > metrics.md
+          cat metrics.md >> $GITHUB_STEP_SUMMARY
+
+      - name: Upload metrics
+        if: github.event_name == 'pull_request_target'
+        uses: actions/upload-artifact@v7
+        with:
+          name: metrics-data
+          path: metrics.md
+
+  comment-metrics:
+    if: github.event_name == 'pull_request_target'
+    runs-on: ubuntu-latest
+    needs: create-metrics
+    permissions:
+      pull-requests: write
+      actions: read
+    steps:
+      - name: Download metrics
+        uses: actions/download-artifact@v8
+        with:
+          name: metrics-data
+
+      - name: find comment
+        uses: peter-evans/find-comment@v4
+        id: fc
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: 'github-actions[bot]'
+          body-includes: '<!-- PSPTOOL-METRICS-MARKER -->'
+
+      - name: create or update comment
+        uses: peter-evans/create-or-update-comment@v5
+        with:
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          issue-number: ${{ github.event.pull_request.number }}
+          body-path: metrics.md
+          edit-mode: replace

{psptool-3.4 → psptool-3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: psptool
-Version: 3.4
+Version: 3.6
 Summary: PSPTool is a tool for dealing with AMD binary blobs
 Author-email: Christian Werling <cwerling@posteo.de>
 License-File: LICENSE

{psptool-3.4 → psptool-3.6}/psptool/directory.py

@@ -216,9 +216,26 @@ class Directory(NestedBuffer):
 
         # 2. Update fields
         entry.type = type_
-        entry.size = size
-        entry.offset = offset
-        # todo: allow updating the address_mode which consists of two bytes right here
+        if entry.type not in File.NO_SIZE_ENTRY_TYPES:
+            entry.size = size
+
+        # Convert the ROM buffer offset back to the value the entry expects, preserving address mode.
+        # This mirrors the inverse of file_offset() in entry.py.
+        addr_mode = self.address_mode
+        if addr_mode == 2 or addr_mode == 3:
+            addr_mode = entry.address_mode
+
+        if addr_mode == 0:
+            # x86 physical: preserve upper bits (e.g. 0xFF000000), replace lower bits
+            addr_mask = self.rom.addr_mask
+            upper_mask = 0xFFFFFFFF ^ addr_mask
+            entry.offset = (entry.offset & upper_mask) | (offset & addr_mask)
+        elif addr_mode == 1:
+            entry.offset = offset
+        elif addr_mode == 2 or addr_mode == 3:
+            entry.offset = offset - self.buffer_offset
+        else:
+            entry.offset = offset
 
         # 3. Update checksum
         self.update_checksum()

{psptool-3.4 → psptool-3.6}/psptool/file.py

@@ -146,7 +146,7 @@ class File(NestedBuffer):
         0x59: 'DMCU_ISR',
         0x5a: 'MSMU_BINARY_0',
         0x5b: 'MSMU_BINARY_1',
-        0x5c: 'WMOS',
+        0x5c: 'SPI_ROM_CONFIG',
         0x5d: 'MPIO_FW',
         0x5e: 'DF_TOPOLOGY',
         0x5f: 'FW_PSP_SMUSCS_OR_TPMLITE',
@@ -248,9 +248,6 @@ class File(NestedBuffer):
 
     @classmethod
     def from_entry(cls, parent_directory, parent_buffer, entry, blob, psptool):
-        if entry.type in cls.NO_SIZE_ENTRY_TYPES:
-            entry.size = 0
-
         assert entry.file_offset() < len(parent_directory.rom), "File offset overflows ROM bounds!"
         file_args = [parent_directory, parent_buffer, entry.file_offset(), entry, blob, psptool]
 

{psptool-3.4 → psptool-3.6}/tests/gha_metrics.py

@@ -77,4 +77,6 @@ if failed_files:
     for file in failed_files:
         print(f"- `{file}`")
 else:
-    print("*All files parsed successfully!*")
+    print("*All files parsed successfully!*")
+
+print("<!-- PSPTOOL-METRICS-MARKER -->")

psptool-3.4/.github/workflows/gha-metrics.yml

@@ -1,34 +0,0 @@
-name: Post metrics comment
-
-on: [pull_request_target]
-
-jobs:
-  test:
-
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.9"]
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-           ref: ${{ github.event.pull_request.head.sha }}
-           submodules: recursive
-           ssh-key: ${{ secrets.PSPTOOL_FIXTURES_NEW_PRIVATE_KEY }}
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v3
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install .
-      - name: Run metrics and post comment
-        run: |
-          python tests/gha_metrics.py > metrics.md
-          gh pr comment $PRNUM --body-file metrics.md
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GH_REPO: ${{ github.repository }}
-          PRNUM: ${{ github.event.pull_request.number }}

psptool-3.4/.github/workflows/python-tests.yml

@@ -1,37 +0,0 @@
-name: Python tests
-
-on: [push, pull_request_target]
-
-jobs:
-  test:
-
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.8", "3.9"]
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.head.sha || github.sha }}
-          submodules: recursive
-          ssh-key: ${{ secrets.PSPTOOL_FIXTURES_NEW_PRIVATE_KEY }}
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v3
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install flake8
-          pip install psptrace  # for integration tests
-          pip install .
-      - name: Lint with flake8
-        run: |
-          # stop the build if there are Python syntax errors or undefined names
-          flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-          # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-          flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-      - name: Test with unittest
-        run: |
-          python -m unittest discover -s tests -v