Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fix per recent envytools updates

  • Loading branch information...
commit 41b7e8e1743096e661cfb82224da7fdca5ada76c 1 parent 329bdb5
@mharsch mharsch authored
Showing with 26 additions and 18 deletions.
  1. +12 −4 pscnv/CMakeLists.txt
  2. +1 −1  pscnv/nv98_crypt.fuc
  3. +13 −13 pscnv/nvc0_pdaemon.fuc
View
16 pscnv/CMakeLists.txt
@@ -11,32 +11,39 @@ add_custom_command(OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/pscnv_kapi.h"
# generating nv98_crypt.fuc.h
add_custom_command(OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/nv98_crypt.fuc.h"
- COMMAND envyas -m fuc -a "${CMAKE_CURRENT_SOURCE_DIR}/nv98_crypt.fuc"
+ COMMAND envyas -m fuc -V fuc0 -F crypt -a "${CMAKE_CURRENT_SOURCE_DIR}/nv98_crypt.fuc"
-o "${CMAKE_CURRENT_SOURCE_DIR}/nv98_crypt.fuc.h"
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/nv98_crypt.fuc"
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
# generating nvc0_grhub.fuc.h
add_custom_command(OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/nvc0_grhub.fuc.h"
- COMMAND m4 "${CMAKE_CURRENT_SOURCE_DIR}/nvc0_grhub.fuc" | envyas -a -w -m fuc -V nva3
+ COMMAND m4 "${CMAKE_CURRENT_SOURCE_DIR}/nvc0_grhub.fuc" | envyas -a -w -m fuc -V fuc3
-o "${CMAKE_CURRENT_SOURCE_DIR}/nvc0_grhub.fuc.h"
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/nvc0_grhub.fuc"
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
# generating nvc0_grgpc.fuc.h
add_custom_command(OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/nvc0_grgpc.fuc.h"
- COMMAND m4 "${CMAKE_CURRENT_SOURCE_DIR}/nvc0_grgpc.fuc" | envyas -a -w -m fuc -V nva3
+ COMMAND m4 "${CMAKE_CURRENT_SOURCE_DIR}/nvc0_grgpc.fuc" | envyas -a -w -m fuc -V fuc3
-o "${CMAKE_CURRENT_SOURCE_DIR}/nvc0_grgpc.fuc.h"
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/nvc0_grgpc.fuc"
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
# generating nvc0_copy.fuc.h
add_custom_command(OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/nvc0_copy.fuc.h"
- COMMAND m4 -DNVC0 "${CMAKE_CURRENT_SOURCE_DIR}/nva3_copy.fuc" | envyas -a -w -m fuc -V nva3
+ COMMAND m4 -DNVC0 "${CMAKE_CURRENT_SOURCE_DIR}/nva3_copy.fuc" | envyas -a -w -m fuc -V fuc3
-o "${CMAKE_CURRENT_SOURCE_DIR}/nvc0_copy.fuc.h"
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/nva3_copy.fuc"
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
+# generating nvc0_pdaemon.fuc.h
+add_custom_command(OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/nvc0_pdaemon.fuc.h"
+ COMMAND envyas -a "${CMAKE_CURRENT_SOURCE_DIR}/nvc0_pdaemon.fuc" -w -m fuc -V fuc3
+ -o "${CMAKE_CURRENT_SOURCE_DIR}/nvc0_pdaemon.fuc.h"
+ DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/nvc0_pdaemon.fuc"
+ WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
+
# generating makefile for building kernel module
set(sources
@@ -131,6 +138,7 @@ add_custom_command(OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/pscnv.ko"
"${CMAKE_CURRENT_SOURCE_DIR}/nvc0_grhub.fuc.h"
"${CMAKE_CURRENT_SOURCE_DIR}/nvc0_grgpc.fuc.h"
"${CMAKE_CURRENT_SOURCE_DIR}/nvc0_copy.fuc.h"
+ "${CMAKE_CURRENT_SOURCE_DIR}/nvc0_pdaemon.fuc.h"
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/pscnv.ko"
View
2  pscnv/nv98_crypt.fuc
@@ -238,7 +238,7 @@ ih:
cmpu b32 $r4 0x60+#dma_count
bra nc #illegal_mthd
shl b32 $r5 $r4 2
- add b32 $r5 (#ctx_dma - 0x60 * 4) & 0xffff
+ add b32 $r5 ((#ctx_dma - 0x60 * 4) & 0xffff)
st b32 D[$r5] $r3
add b32 $r4 0x180 - 0x60
shl b32 $r4 8
View
26 pscnv/nvc0_pdaemon.fuc
@@ -1,16 +1,16 @@
/* envyas -a -w -m fuc -V nva3 -o out.fuc.h */
-section #nvc0_pdaemon_pointers
-b32 #done
-b32 #mmwrs
-b32 #mmwr
-b32 #mmrd
-b32 #wait_mask_ext
-b32 #wait_mask_iord
-b32 #sleep
-b32 #enter_lock
-b32 #leave_lock
-
-section #nvc0_pdaemon_code
+.section #nvc0_pdaemon_pointers
+.b32 #done
+.b32 #mmwrs
+.b32 #mmwr
+.b32 #mmrd
+.b32 #wait_mask_ext
+.b32 #wait_mask_iord
+.b32 #sleep
+.b32 #enter_lock
+.b32 #leave_lock
+
+.section #nvc0_pdaemon_code
init:
bclr $flags ie0
bclr $flags ie1
@@ -239,5 +239,5 @@ main:
st b32 D[$r3] $r10
add b32 $r3 4
bra #main
-align 256
+.align 256
Please sign in to comment.
Something went wrong with that request. Please try again.